diff --git a/sleepyhead/Graphs/gFlagsLine.cpp b/sleepyhead/Graphs/gFlagsLine.cpp
index 5e61e6eb..80c1e412 100644
--- a/sleepyhead/Graphs/gFlagsLine.cpp
+++ b/sleepyhead/Graphs/gFlagsLine.cpp
@@ -306,7 +306,7 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
             continue;
         }
 
-        drift = ((*s)->machine()->type() == MT_CPAP) ? clockdrift : 0;
+        drift = ((*s)->type() == MT_CPAP) ? clockdrift : 0;
 
         cei = (*s)->eventlist.find(m_code);
 
diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 915cdb58..5feed0cc 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -545,8 +545,11 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
         dot.visible = false;
     }
 
+    Session * sess = nullptr;
+    ChannelID code;
+
     for (int gi = 0; gi < m_codes.size(); gi++) {
-        ChannelID code = m_codes[gi];
+        code = m_codes[gi];
         schema::Channel &chan = schema::channel[code];
 
         ////////////////////////////////////////////////////////////////////////
@@ -579,14 +582,14 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
         // For each session...
         int daysize = m_day->size();
         for (int svi = 0; svi < daysize; svi++) {
-            Session *sess = (*m_day)[svi];
+            sess = (*m_day)[svi];
 
             if (!sess) {
                 qWarning() << "gLineChart::Plot() nullptr Session Record.. This should not happen";
                 continue;
             }
 
-            drift = (sess->machine()->type() == MT_CPAP) ? clockdrift : 0;
+            drift = (sess->type() == MT_CPAP) ? clockdrift : 0;
 
             if (!sess->enabled()) { continue; }
 
@@ -1042,7 +1045,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
     for (int i=0; i < dotlinesize; i++) {
         DottedLine & dot = m_dotlines[i];
         if (!dot.visible) continue;
-        ChannelID code = dot.code;
+        code = dot.code;
         schema::Channel &chan = schema::channel[code];
         int linewidth = (10 * ratioX);
         QRectF rec(0, rect.top()-3, 0,0);
@@ -1084,8 +1087,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
     // Calculate the CPAP session time.
     for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); s++) {
-        Session * sess = *s;
-        if (!sess->enabled() || (sess->machine()->type() != MT_CPAP)) continue;
+        sess = *s;
+        if (!sess->enabled() || (sess->type() != MT_CPAP)) continue;
 
         first = sess->first();
         last = sess->last();
@@ -1127,10 +1130,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
         bool blockhover = false;
 
         for (fit = flags.begin(); fit != flags.end(); ++fit) {
-            ChannelID code = fit.key();
-            if (code == 4098) {
-                int i=5; Q_UNUSED(i);
-            }
+            code = fit.key();
             if ((!m_flags_enabled[code]) || (!m_day->channelExists(code))) continue;
             gLineOverlayBar * lob = fit.value();
             lob->setBlockHover(blockhover);
@@ -1143,8 +1143,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
             }
         }
     }
-    if (m_codes[0] == OXI_SPO2Drop) {
-    }
+//    if (m_codes[0] == OXI_SPO2Drop) {
+//    }
     if (m_codes[0] == CPAP_FlowRate) {
         float hours = time / 3600.0;
         int h = time / 3600;
diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp
index 1dd70f66..91df3184 100644
--- a/sleepyhead/Graphs/gLineOverlay.cpp
+++ b/sleepyhead/Graphs/gLineOverlay.cpp
@@ -96,7 +96,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
         if (evlist.size() == 0) { continue; }
 
-        drift = ((*s)->machine()->type() == MT_CPAP) ? clockdrift : 0;
+        drift = ((*s)->type() == MT_CPAP) ? clockdrift : 0;
 
         // Could loop through here, but nowhere uses more than one yet..
         for (int k = 0; k < evlist.size(); k++) {
diff --git a/sleepyhead/Graphs/gSessionTimesChart.cpp b/sleepyhead/Graphs/gSessionTimesChart.cpp
index 4a8e015f..4f937e34 100644
--- a/sleepyhead/Graphs/gSessionTimesChart.cpp
+++ b/sleepyhead/Graphs/gSessionTimesChart.cpp
@@ -870,7 +870,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
 
             for (si = day->begin(); si != day->end(); ++si) {
                 Session *sess = (*si);
-                if (!sess->enabled() || (sess->machine()->type() != m_machtype)) continue;
+                if (!sess->enabled() || (sess->type() != m_machtype)) continue;
 
                 // Look at mask on/off slices...
                 int slize = sess->m_slices.size();
diff --git a/sleepyhead/SleepLib/calcs.cpp b/sleepyhead/SleepLib/calcs.cpp
index e0f006d9..b5c540b0 100644
--- a/sleepyhead/SleepLib/calcs.cpp
+++ b/sleepyhead/SleepLib/calcs.cpp
@@ -861,7 +861,7 @@ void FlowParser::flagEvents()
 
 void calcRespRate(Session *session, FlowParser *flowparser)
 {
-    if (session->machine()->type() != MT_CPAP) { return; }
+    if (session->type() != MT_CPAP) { return; }
 
     //    if (session->machine()->loaderName() != STR_MACH_PRS1) return;
 
@@ -1001,7 +1001,7 @@ int calcAHIGraph(Session *session)
 
     bool zeroreset = p_profile->cpap->AHIReset();
 
-    if (session->machine()->type() != MT_CPAP) { return 0; }
+    if (session->type() != MT_CPAP) { return 0; }
 
     bool hasahi = session->eventlist.contains(CPAP_AHI);
     bool hasrdi = session->eventlist.contains(CPAP_RDI);
@@ -1746,7 +1746,7 @@ bool mmaskFirst = true;
 int calcLeaks(Session *session)
 {
 
-    if (session->machine()->type() != MT_CPAP) { return 0; }
+    if (session->type() != MT_CPAP) { return 0; }
 
     if (session->eventlist.contains(CPAP_Leak)) { return 0; } // abort if already there
 
diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp
index 85c6e528..700a3279 100644
--- a/sleepyhead/SleepLib/day.cpp
+++ b/sleepyhead/SleepLib/day.cpp
@@ -51,7 +51,7 @@ Session * Day::firstSession(MachineType type)
     for (int i=0; i<sessions.size(); i++) {
         Session * sess = sessions.at(i);
         if (!sess->enabled()) continue;
-        if (sess->machine()->type() == type) {
+        if (sess->type() == type) {
             return sess;
         }
     }
@@ -86,7 +86,7 @@ QList<Session *> Day::getSessions(MachineType type, bool ignore_enabled)
         if (!ignore_enabled && !(*it)->enabled())
             continue;
 
-        if ((*it)->machine()->type() == type)
+        if ((*it)->type() == type)
             newlist.append((*it));
     }
 
@@ -109,7 +109,7 @@ void Day::addSession(Session *s)
 {
     invalidate();
     Q_ASSERT(s!=nullptr);
-    QHash<MachineType, Machine *>::iterator mi = machines.find(s->machine()->type());
+    QHash<MachineType, Machine *>::iterator mi = machines.find(s->type());
 
     if (mi != machines.end()) {
         if (mi.value() != s->machine()) {
@@ -117,7 +117,7 @@ void Day::addSession(Session *s)
             return;
         }
     } else {
-        machines[s->machine()->type()] = s->machine();
+        machines[s->type()] = s->machine();
     }
 
     sessions.push_back(s);
@@ -717,7 +717,7 @@ qint64 Day::total_time()
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session &sess = *(*it);
 
-        if (sess.enabled() && (sess.machine()->type() != MT_JOURNAL)) {
+        if (sess.enabled() && (sess.type() != MT_JOURNAL)) {
             first = sess.first();
             last = sess.last();
 
@@ -778,7 +778,7 @@ qint64 Day::total_time(MachineType type)
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session &sess = *(*it);
 
-        if ((sess.machine()->type() == type) && sess.enabled()) {
+        if ((sess.type() == type) && sess.enabled()) {
             first = sess.first();
             last = sess.last();
 
@@ -844,7 +844,7 @@ bool Day::hasEnabledSessions(MachineType type)
     QList<Session *>::iterator end = sessions.end();
 
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
-        if (((*it)->machine()->type() == type) && (*it)->enabled()) {
+        if (((*it)->type() == type) && (*it)->enabled()) {
             return true;
         }
     }
@@ -979,7 +979,7 @@ bool Day::hasData(ChannelID code, SummaryType type)
 
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session & sess = *(*it);
-        if (sess.machine()->type() == MT_JOURNAL) continue;
+        if (sess.type() == MT_JOURNAL) continue;
 
         if (sess.enabled()) {
             switch (type) {
@@ -1218,16 +1218,17 @@ bool Day::channelHasData(ChannelID id)
         Session & sess = *(*it);
 
         if (sess.enabled()) {
-            if (sess.channelExists(id)) {
+            if (sess.m_cnt.contains(id)) {
+                return true;
+            }
+
+            if (sess.eventlist.contains(id)) {
                 return true;
             }
 
             if (sess.m_valuesummary.contains(id)) {
                 return true;
             }
-            if (sess.m_cnt.contains(id)) {
-                return true;
-            }
         }
     }
 
@@ -1236,10 +1237,10 @@ bool Day::channelHasData(ChannelID id)
 
 void Day::OpenEvents()
 {
-    if (d_events_open)
-        return;
+//    if (d_events_open)
+//        return;
     Q_FOREACH(Session * session, sessions) {
-        if (session->machine()->type() != MT_JOURNAL)
+        if (session->type() != MT_JOURNAL)
             session->OpenEvents();
     }
     d_events_open = true;
@@ -1325,7 +1326,7 @@ qint64 Day::first(MachineType type)
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session & sess = *(*it);
 
-        if ((sess.machine()->type() == type) && sess.enabled()) {
+        if ((sess.type() == type) && sess.enabled()) {
             tmp = sess.first();
 
             if (!tmp) { continue; }
@@ -1349,7 +1350,7 @@ qint64 Day::first()
     QList<Session *>::iterator end = sessions.end();
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session & sess = *(*it);
-        if (sess.machine()->type() == MT_JOURNAL) continue;
+        if (sess.type() == MT_JOURNAL) continue;
         if (sess.enabled()) {
             tmp = sess.first();
 
@@ -1376,7 +1377,7 @@ qint64 Day::last()
 
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session & sess = *(*it);
-        if (sess.machine()->type() == MT_JOURNAL) continue;
+        if (sess.type() == MT_JOURNAL) continue;
 
         if (sess.enabled()) {
             tmp = sess.last();
@@ -1405,7 +1406,7 @@ qint64 Day::last(MachineType type)
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session & sess = *(*it);
 
-        if ((sess.machine()->type() == type) && sess.enabled()) {
+        if ((sess.type() == type) && sess.enabled()) {
             tmp = sess.last();
 
             if (!tmp) { continue; }
diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
index 409e00c2..208c2050 100644
--- a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
@@ -739,6 +739,7 @@ bool FPIconLoader::OpenSummary(Machine *mach, QString filename)
             sess->settings[CPAP_HumidSetting] = x2;
             //sess->settings[CPAP_PresReliefType]=PR_SENSAWAKE;
             Sessions[ts] = sess;
+
             addSession(sess);
         }
     } while (!in.atEnd());
diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp
index 1deac880..ca3da23b 100644
--- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp
@@ -555,8 +555,8 @@ int IntellipapLoader::Open(QString path)
                 sess->settings[CPAP_RampPressure] = ramp_pressure;
                 sess->settings[CPAP_RampTime] = ramp_time;
 
-
                 sess->UpdateSummaries();
+
                 addSession(sess);
             } else {
                 delete sess;
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index 4d5a4fc6..4f6ef980 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -757,11 +757,21 @@ void ResmedImport::run()
     Q_FOREACH(QString file, files[EDF_CSL]) {
 //        loader->LoadCSL(sess, file);
     }
+
+    bool haveeve = false;
     Q_FOREACH(QString file, files[EDF_EVE]) {
         loader->LoadEVE(sess, file);
 #ifdef SESSION_DEBUG
         sess->session_files.append(file);
 #endif
+        haveeve = true;
+    }
+
+    if (!haveeve) {
+        sess->AddEventList(CPAP_Obstructive, EVL_Event);
+        sess->AddEventList(CPAP_ClearAirway, EVL_Event);
+        sess->AddEventList(CPAP_Apnea, EVL_Event);
+        sess->AddEventList(CPAP_Hypopnea, EVL_Event);
     }
 
 
@@ -924,6 +934,7 @@ void ResmedImportStage2::run()
     // Claim this record for future imports
     sess->settings[RMS9_MaskOnTime] = R.maskon;
     sess->setSummaryOnly(true);
+
 #ifdef SESSION_DEBUG
     sess->session_files.append("STR.edf");
 #endif
diff --git a/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp b/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp
index 853cba67..55148f10 100644
--- a/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp
@@ -162,6 +162,7 @@ int SomnoposeLoader::OpenFile(QString filename)
 
     sess->really_set_last(time);
     sess->SetChanged(true);
+
     mach->AddSession(sess);
 
     mach->Save();
diff --git a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp
index fcb4f6a9..fce18be6 100644
--- a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp
@@ -459,13 +459,8 @@ int WeinmannLoader::Open(QString path)
             p += 6;
         }
 
-
-
         sess->UpdateSummaries();
         mach->AddSession(sess);
-
-
-
     }
     delete [] data;
     delete [] st;
diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp
index 0f431992..6c005884 100644
--- a/sleepyhead/SleepLib/profiles.cpp
+++ b/sleepyhead/SleepLib/profiles.cpp
@@ -672,7 +672,7 @@ Day *Profile::GetGoodDay(QDate date, MachineType type)
     // For a machine match, find at least one enabled Session.
     for (int i = 0; i < day->size(); ++i) {
         Session * sess = (*day)[i];
-        if (((type == MT_UNKNOWN) || (sess->machine()->type() == type)) && sess->enabled()) {
+        if (((type == MT_UNKNOWN) || (sess->type() == type)) && sess->enabled()) {
             day->OpenSummary();
 
             return day;
@@ -692,7 +692,7 @@ Day *Profile::FindGoodDay(QDate date, MachineType type)
     // For a machine match, find at least one enabled Session.
     for (int i = 0; i < day->size(); ++i) {
         Session * sess = (*day)[i];
-        if (((type == MT_UNKNOWN) || (sess->machine()->type() == type)) && sess->enabled()) {
+        if (((type == MT_UNKNOWN) || (sess->type() == type)) && sess->enabled()) {
             return day;
         }
     }
diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp
index d3fd2335..007e3d45 100644
--- a/sleepyhead/SleepLib/session.cpp
+++ b/sleepyhead/SleepLib/session.cpp
@@ -35,6 +35,7 @@ Session::Session(Machine *m, SessionID session)
     }
 
     s_machine = m;
+    s_machtype = m->type();
     s_session = session;
     s_changed = false;
     s_events_loaded = false;
diff --git a/sleepyhead/SleepLib/session.h b/sleepyhead/SleepLib/session.h
index dd4c468d..2d6171f2 100644
--- a/sleepyhead/SleepLib/session.h
+++ b/sleepyhead/SleepLib/session.h
@@ -361,6 +361,11 @@ class Session
         s_summaryOnly = b;
     }
 
+    void setOpened(bool b = true) {
+        s_events_loaded = b;
+        s_summary_loaded = b;
+    }
+
     //! \brief Completely purges Session from memory and disk.
     bool Destroy();
 
@@ -375,6 +380,10 @@ class Session
 
     QString eventFile() const;
 
+    MachineType type() { return s_machtype; }
+
+
+
 #if defined(SESSION_DEBUG)
     QStringList session_files;
 #endif
@@ -397,6 +406,7 @@ protected:
 
     // for debugging
     bool destroyed;
+    MachineType s_machtype;
 };
 
 QDataStream & operator<<(QDataStream & out, const Session & session);
diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index d17237f8..3b50cc6f 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -530,7 +530,7 @@ void Daily::ReloadGraphs()
 
     if (previous_date.isValid()) {
         d=previous_date;
-//        Unload(d);
+        //Unload(d);
     }
     d=p_profile->LastDay();
     if (!d.isValid()) {
@@ -598,7 +598,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
             m = sess->eventlist.find(code);
             if (m == sess->eventlist.end()) continue;
 
-            drift=(sess->machine()->type() == MT_CPAP) ? clockdrift : 0;
+            drift=(sess->type() == MT_CPAP) ? clockdrift : 0;
 
             QTreeWidgetItem *mcr;
             if (mcroot.find(code)==mcroot.end()) {
@@ -892,7 +892,7 @@ QString Daily::getSessionInformation(Day * day)
         QList<Session *> sesslist = day->getSessions(mi.key(), true);
 
         for (QList<Session *>::iterator s=sesslist.begin(); s != sesslist.end(); ++s) {
-            if (((*s)->machine()->type() == MT_CPAP) &&
+            if (((*s)->type() == MT_CPAP) &&
                 ((*s)->settings.find(CPAP_BrokenWaveform) != (*s)->settings.end()))
                     corrupted_waveform=true;
 
@@ -1631,7 +1631,7 @@ void Daily::Load(QDate date)
 
         for (i=day->begin();i!=day->end();++i) {
             Session * s=*i;
-            if ((*s).machine()->type() == MT_CPAP)
+            if ((*s).type() == MT_CPAP)
                 sessbar->add(s, cols[c % maxcolors]);
             c++;
         }
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 47b51d73..3c93f0f6 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -708,7 +708,7 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
 
 void MainWindow::finishCPAPImport()
 {
-    p_profile->Save();
+    p_profile->StoreMachines();
     GenerateStatistics();
 
     if (overview) { overview->ReloadGraphs(); }
@@ -2082,11 +2082,12 @@ void MainWindow::on_actionRebuildCPAP(QAction *action)
     }
     if (overview) overview->ReloadGraphs();
     if (daily) {
+        daily->Unload();
         daily->clearLastDay(); // otherwise Daily will crash
         daily->ReloadGraphs();
     }
     GenerateStatistics();
-    p_profile->Save();
+    p_profile->StoreMachines();
 }
 
 void MainWindow::on_actionPurgeMachine(QAction *action)
diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp
index fecfafd4..692438f1 100644
--- a/sleepyhead/oximeterimport.cpp
+++ b/sleepyhead/oximeterimport.cpp
@@ -454,6 +454,8 @@ void OximeterImport::on_liveImportButton_clicked()
 
     ELplethy->setFirst(start_ti);
     session->really_set_first(start_ti);
+    session->setOpened(true);
+
     dummyday->addSession(session);
 
     plethyChart->setMinX(start_ti);
@@ -822,7 +824,8 @@ void OximeterImport::on_saveButton_clicked()
     qint64 step = (importMode == IM_LIVE) ? oximodule->liveResolution() : oximodule->importResolution();
     int size = oxirec->size();
 
-    for (int i=1; i < size; ++i) {
+    // why was I skipping the first sample? not priming it anymore..
+    for (int i=0; i < size; ++i) {
         OxiRecord * rec = &(*oxirec)[i];
 
         if (rec->pulse > 0) {
@@ -953,6 +956,8 @@ void OximeterImport::on_saveButton_clicked()
     session->really_set_last(ti);
     session->SetChanged(true);
 
+    session->setOpened(true);
+
     mach->AddSession(session);
     mach->Save();
     mach->SaveSummary();