diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp
index 0e3e20b1..f6e273c4 100644
--- a/Graphs/gLineChart.cpp
+++ b/Graphs/gLineChart.cpp
@@ -164,8 +164,6 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
                     //assert(x1<x2);
                 //}
             }
-            done=false;
-            first=true;
 
             if (accel) {
                 x1=el.time(1);
@@ -264,6 +262,9 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
             const vector<EventStoreType> & dat=el.getData();
             const vector<qint64> & tim=el.getTime();
 
+            done=false;
+            first=true;
+
             bool firstpx=true;
             if (el.type()==EVL_Waveform) {  // Waveform Plot
                 time=el.time(idx);
@@ -340,7 +341,12 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
                         lastpy=py;
                     }
                 }
-            } else { // Standard events/zoomed in Plot
+
+            } else {
+//////////////////////////////////////////////////////////////////
+// Standard events/zoomed in Plot
+//////////////////////////////////////////////////////////////////
+                first=true;
                 for (int i=idx;i<siz;i+=sam) {
                     time=tim[i]; //el.time(i);
 
@@ -348,6 +354,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
                         if (time < minx) continue; // Skip stuff before the start of our data window
                         first=false;
                         if (i>=sam)  i-=sam; // Start with the previous sample (which will be in clipping area)
+                        time=tim[i]; //el.time(i);
                     }
                     data=dat[i]*gain; //
                     //data=el.data(i); // raw access is faster
diff --git a/daily.cpp b/daily.cpp
index f2d99aad..9ed0c9fe 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -308,7 +308,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
     tree->clear();
     if (!day) return;
 
-    return;
+    //return;
     tree->setColumnCount(1); // 1 visible common.. (1 hidden)
 
     QTreeWidgetItem *root=NULL;//new QTreeWidgetItem((QTreeWidget *)0,QStringList("Stuff"));
@@ -325,16 +325,15 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
 
         for (m=(*s)->eventlist.begin();m!=(*s)->eventlist.end();m++) {
             MachineCode code=m->first;
-            if (code==CPAP_Leak) continue;
-            if (code==CPAP_RespiratoryRate) continue;
-            if (code==CPAP_TidalVolume) continue;
-            if (code==CPAP_MinuteVentilation) continue;
-            if (code==CPAP_FlowLimitGraph) continue;
-
-            // Note this is not so evil on PRS1.
-            if (code==CPAP_Pressure) continue;
-            if (code==CPAP_Snore) continue;
-            if (code==PRS1_Unknown12) continue;
+            if ((code!=CPAP_Obstructive)
+                && (code!=CPAP_Hypopnea)
+                && (code!=CPAP_Apnea)
+                && (code!=CPAP_ClearAirway)
+                && (code!=CPAP_CSR)
+                && (code!=CPAP_RERA)
+                && (code!=CPAP_FlowLimit)
+                && (code!=PRS1_PressurePulse)
+                && (code!=CPAP_VSnore)) continue;
             QTreeWidgetItem *mcr;
             if (mcroot.find(code)==mcroot.end()) {
                 int cnt=day->count(code);