diff --git a/SleepLib/loader_plugins/cms50_loader.cpp b/SleepLib/loader_plugins/cms50_loader.cpp
index 43690c42..a78f5190 100644
--- a/SleepLib/loader_plugins/cms50_loader.cpp
+++ b/SleepLib/loader_plugins/cms50_loader.cpp
@@ -29,6 +29,8 @@ using namespace std;
 
 extern QProgressBar *qprogress;
 
+// Possibly need to replan this to include oximetry
+
 CMS50Loader::CMS50Loader()
 {
 }
diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp
index 02e3b6e2..de5c5984 100644
--- a/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/SleepLib/loader_plugins/resmed_loader.cpp
@@ -395,9 +395,13 @@ int ResmedLoader::Open(QString & path,Profile *profile)
             int dn=dif/86400000L;
             if (dn<days) {
                 int mode;
-                mode=(*stredf.lookup["Mode"]).data[dn];
-                sess->settings["EPR"]=(*stredf.lookup["EPR"]).data[dn];
-                sess->settings["EPRSet"]=(*stredf.lookup["EPR Level"]).data[dn];
+                if (stredf.lookup.contains("Mode"))
+                    mode=(*stredf.lookup["Mode"]).data[dn];
+                else mode=0;
+                if (stredf.lookup.contains("EPR"))
+                    sess->settings["EPR"]=(*stredf.lookup["EPR"]).data[dn];
+                if (stredf.lookup.contains("EPRSet"))
+                    sess->settings["EPRSet"]=(*stredf.lookup["EPR Level"]).data[dn];
 
                 EDFSignal *sig;
                 if (mode==0) {
diff --git a/daily.h b/daily.h
index 871db843..a08feeb1 100644
--- a/daily.h
+++ b/daily.h
@@ -72,22 +72,20 @@ private:
 
     QList<Layer *> OXIData;
     QList<Layer *> CPAPData;
-    //QVector<gGraph *> Graphs;
+
     QVector<QAction *> GraphAction;
     QGLContext *offscreen_context;
 
     QList<int> splitter_sizes;
     Layer * AddCPAP(Layer *d) { CPAPData.push_back(d); return d; }
     Layer * AddOXI(Layer *d) { OXIData.push_back(d); return d; }
-    //void AddGraph(gGraph *w);
+
     void UpdateCPAPGraphs(Day *day);
     void UpdateOXIGraphs(Day *day);
 
     MainWindow * mainwin;
     Ui::Daily *ui;
     QDate previous_date;
-    //QScrollArea *scrollArea;
-    //QVBoxLayout *splitter;
     QMenu *show_graph_menu;
 
     gGraphView *GraphView,*snapGV;