diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp
index 60e6e295..f11d0fa8 100644
--- a/SleepLib/day.cpp
+++ b/SleepLib/day.cpp
@@ -345,8 +345,9 @@ bool Day::settingExists(ChannelID id)
 }
 bool Day::channelExists(ChannelID id)
 {
-    if (machine->hasChannel(id)) return true;
-    return false;
+    return channelHasData(id);
+    //if (machine->hasChannel(id)) return true;
+    //return false;
 }
 bool Day::channelHasData(ChannelID id)
 {
diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp
index 32b45144..f01e3f8e 100644
--- a/SleepLib/machine.cpp
+++ b/SleepLib/machine.cpp
@@ -233,7 +233,7 @@ bool Machine::Load()
     if (!dir.exists() || !dir.isReadable())
         return false;
 
-    QString fn=path+"/channels.dat";
+/*    QString fn=path+"/channels.dat";
     QFile cf(fn);
     cf.open(QIODevice::ReadOnly);
     QDataStream in(&cf);
@@ -255,8 +255,7 @@ bool Machine::Load()
         qDebug() << "Machine Channel file format is wrong" << fn;
     }
     in >> m_channels;
-    cf.close();
-
+    cf.close(); */
 
     dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     dir.setSorting(QDir::Name);
@@ -322,7 +321,7 @@ bool Machine::Save()
         dir.mkdir(path);
     }
 
-    QString fn=path+"/channels.dat";
+    /*QString fn=path+"/channels.dat";
     QFile cf(fn);
     if (!cf.open(QIODevice::WriteOnly)) {
         qDebug() << "Couldn't write.. Permissions? Hard disk crashing?";
@@ -337,7 +336,7 @@ bool Machine::Save()
     out << (quint32)m_id;// Machine ID
 
     out << m_channels;
-    cf.close();
+    cf.close(); */
 
 
     // Calculate size for progress bar
diff --git a/SleepLib/machine.h b/SleepLib/machine.h
index ad9e14bc..4985be9f 100644
--- a/SleepLib/machine.h
+++ b/SleepLib/machine.h
@@ -91,8 +91,8 @@ public:
     const MachineID & id() { return m_id; }
     const QDate & FirstDay() { return firstday; }
     const QDate & LastDay() { return lastday; }
-    bool hasChannel(QString id) { return m_channels.contains(id) && m_channels[id]; }
-    void registerChannel(QString id,bool b=true) { m_channels[id]=b; }
+    //bool hasChannel(QString id) { return m_channels.contains(id) && m_channels[id]; }
+    //void registerChannel(QString id,bool b=true) { m_channels[id]=b; }
 
 protected:
     QDate firstday,lastday;
@@ -104,7 +104,7 @@ protected:
     Profile *profile;
     bool changed;
     bool firstsession;
-    QHash<QString,bool> m_channels;
+    //QHash<QString,bool> m_channels;
 };
 
 class CPAP:public Machine
diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp
index 76385c60..7c0ee34f 100644
--- a/SleepLib/session.cpp
+++ b/SleepLib/session.cpp
@@ -918,6 +918,6 @@ EventList * Session::AddEventList(QString chan, EventListType et,EventDataType g
     }
     EventList * el=new EventList(et,gain,offset,min,max,rate,second_field);
     eventlist[chan].push_back(el);
-    s_machine->registerChannel(chan);
+    //s_machine->registerChannel(chan);
     return el;
 }
diff --git a/daily.cpp b/daily.cpp
index dc69926c..cb68b8ce 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -267,7 +267,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
 
     ui->webView->settings()->setFontSize(QWebSettings::DefaultFontSize,QApplication::font().pointSize());
     ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
-    connect(ui->webView,SIGNAL(linkClicked(QUrl)),this,SLOT(on_Link_clicked(QUrl)));
+    connect(ui->webView,SIGNAL(linkClicked(QUrl)),this,SLOT(Link_clicked(QUrl)));
 
     if (!PROFILE.Exists("EventViewSize")) PROFILE["EventViewSize"]=4;
     int ews=PROFILE["EventViewSize"].toInt();
@@ -285,7 +285,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
         GraphToggles[title]=btn;
         btn->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);
         ui->graphToggleArea->addWidget(btn);
-        connect(btn,SIGNAL(toggled(bool)),this,SLOT(on_graphtogglebutton_toggled(bool)));
+        connect(btn,SIGNAL(toggled(bool)),this,SLOT(graphtogglebutton_toggled(bool)));
     }
     ui->graphToggleArea->addSpacerItem(new QSpacerItem(0,0,QSizePolicy::Expanding));
 
@@ -308,7 +308,7 @@ Daily::~Daily()
 {
     GraphView->SaveSettings("Daily");
 
-    disconnect(ui->webView,SIGNAL(linkClicked(QUrl)),this,SLOT(on_Link_clicked(QUrl)));
+    disconnect(ui->webView,SIGNAL(linkClicked(QUrl)),this,SLOT(Link_clicked(QUrl)));
     // Save any last minute changes..
     if (previous_date.isValid())
         Unload(previous_date);
@@ -316,7 +316,7 @@ Daily::~Daily()
 //    delete splitter;
     delete ui;
 }
-void Daily::on_Link_clicked(const QUrl &url)
+void Daily::Link_clicked(const QUrl &url)
 {
     QString code=url.toString().section("=",0,0).toLower();
     QString data=url.toString().section("=",1);
@@ -327,13 +327,15 @@ void Daily::on_Link_clicked(const QUrl &url)
     } else if (code=="oxi") {
         day=PROFILE.GetDay(previous_date,MT_OXIMETER);
     } else if (code=="event")  {
-        QList<QTreeWidgetItem *> list=ui->treeWidget->findItems(data,Qt::MatchContains);
+        QList<QTreeWidgetItem *> list=ui->treeWidget->findItems(schema::channel[data].description(),Qt::MatchContains);
         if (list.size()>0) {
             ui->treeWidget->collapseAll();
             ui->treeWidget->expandItem(list.at(0));
             QTreeWidgetItem *wi=list.at(0)->child(0);
             ui->treeWidget->setCurrentItem(wi);
             ui->tabWidget->setCurrentIndex(1);
+        } else {
+            mainwin->Notify("No "+schema::channel[data].description()+" events are recorded this day",1500);
         }
     } else if (code=="graph") {
         qDebug() << "Select graph " << data;
@@ -538,8 +540,9 @@ void Daily::ShowHideGraphs()
     //splitter->update();
     RedrawGraphs(); */
 }
-void Daily::on_graphtogglebutton_toggled(bool b)
+void Daily::graphtogglebutton_toggled(bool b)
 {
+    Q_UNUSED(b)
     for (int i=0;i<GraphView->size();i++) {
         QString title=(*GraphView)[i]->title();
         (*GraphView)[i]->setVisible(GraphToggles[title]->isChecked());
@@ -562,6 +565,21 @@ void Daily::Load(QDate date)
             }
         }
     }
+
+    if (cpap && oxi) {
+        qint64 len=qAbs(cpap->first() - oxi->first());
+        if (len>30000) {
+            GraphView->findGraph("Pulse")->setGroup(1);
+            GraphView->findGraph("SpO2")->setGroup(1);
+            GraphView->findGraph("Plethy")->setGroup(1);
+            mainwin->Notify("Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked.",3000);
+        } else {
+            mainwin->Notify("Oximetry & CPAP graphs are linked for this day",2000);
+            GraphView->findGraph("Pulse")->setGroup(0);
+            GraphView->findGraph("SpO2")->setGroup(0);
+            GraphView->findGraph("Plethy")->setGroup(0);
+        }
+    }
     lastcpapday=cpap;
     QString html="<html><head><style type='text/css'>"
     "p,a,td,body { font-family: 'FreeSans', 'Sans Serif'; }"
@@ -666,28 +684,28 @@ void Daily::Load(QDate date)
             cs="4 width='100%' align=center>";
         } else cs="2 width='50%'>";
         html+="<tr><td colspan="+cs+"<table cellspacing=0 cellpadding=1 border=0 width='100%'>"
-        "<tr><td align='right' bgcolor='#F88017'><b><font color='black'>"+tr("AHI")+"</font></b></td><td width=20% bgcolor='#F88017'><b><font color='black'>"+QString().sprintf("%.2f",ahi)+"</font></b></td></tr>\n"
-        "<tr><td align='right' bgcolor='#4040ff'><b><font color='white'>&nbsp;<a href='event=Hypopnea'>"+tr("Hypopnea")+"</a></font></b></td><td bgcolor='#4040ff'><font color='white'>"+QString().sprintf("%.2f",hi)+"</font></td></tr>\n";
+        "<tr><td align='right' bgcolor='#F88017'><b><font color='black'><a href='nothing' title='"+schema::channel[CPAP_AHI].description()+"'>"+tr("AHI")+"</a></font></b></td><td width=20% bgcolor='#F88017'><b><font color='black'>"+QString().sprintf("%.2f",ahi)+"</font></b></td></tr>\n"
+        "<tr><td align='right' bgcolor='#4040ff'><b><font color='white'>&nbsp;<a href='event="+CPAP_Hypopnea+"' title='"+schema::channel[CPAP_Hypopnea].description()+"'>"+tr("Hypopnea")+"</a></font></b></td><td bgcolor='#4040ff'><font color='white'>"+QString().sprintf("%.2f",hi)+"</font></td></tr>\n";
         if (cpap->machine->GetClass()=="ResMed") {
-            html+="<tr><td align='right' bgcolor='#208020'><b>&nbsp;<a href='event=Apnea'>"+tr("Unspecified Apnea")+"</a></b></td><td bgcolor='#208020'>"+QString().sprintf("%.2f",uai)+"</td></tr>\n";
+            html+="<tr><td align='right' bgcolor='#208020'><b>&nbsp;<a href='event="+CPAP_Apnea+"' title='"+schema::channel[CPAP_Apnea].description()+"'>"+tr("Unspecified Apnea")+"</a></b></td><td bgcolor='#208020'>"+QString().sprintf("%.2f",uai)+"</td></tr>\n";
         }
-        html+="<tr><td align='right' bgcolor='#40afbf'><b>&nbsp;<a href='event=Obstructive'>"+tr("Obstructive")+"</a></b></td><td bgcolor='#40afbf'>"+QString().sprintf("%.2f",oai)+"</td></tr>\n"
-        "<tr><td align='right' bgcolor='#b254cd'><b>&nbsp;<a href='event=Clear Airway'>"+tr("Clear Airway")+"</a></b></td><td bgcolor='#b254cd'>"+QString().sprintf("%.2f",cai)+"</td></tr>\n"
+        html+="<tr><td align='right' bgcolor='#40afbf'><b>&nbsp;<a href='event="+CPAP_Obstructive+"' title='"+schema::channel[CPAP_Obstructive].description()+"'>"+tr("Obstructive")+"</a></b></td><td bgcolor='#40afbf'>"+QString().sprintf("%.2f",oai)+"</td></tr>\n"
+        "<tr><td align='right' bgcolor='#b254cd'><b>&nbsp;<a href='event="+CPAP_ClearAirway+"' title='"+schema::channel[CPAP_ClearAirway].description()+"'>"+tr("Clear Airway")+"</a></b></td><td bgcolor='#b254cd'>"+QString().sprintf("%.2f",cai)+"</td></tr>\n"
         "</table></td>";
 
         if (cpap->machine->GetClass()=="PRS1") {
             html+="<td colspan=2><table cellspacing=0 cellpadding=1 border=0 width='100%'>"
-            "<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event=Respiratory Effort'>"+tr("RERA")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",rei)+"</td></tr>\n"
-            "<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event=Flow Limit'>"+tr("Flow Limit")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",fli)+"</font></td></tr>\n"
-            "<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event=Vibratory snore'>"+tr("Vsnore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
-            "<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event=Cheyne Stokes'>"+tr("PB/CSR")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",csr)+"%</td></tr>\n"
+            "<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+CPAP_RERA+"' title='"+schema::channel[CPAP_RERA].description()+"'>"+tr("RERA")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",rei)+"</td></tr>\n"
+            "<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+CPAP_FlowLimit+"' title='"+schema::channel[CPAP_FlowLimit].description()+"'>"+tr("Flow Limit")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",fli)+"</font></td></tr>\n"
+            "<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+CPAP_VSnore+"'title=' "+schema::channel[CPAP_VSnore].description()+"'>"+tr("Vsnore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
+                    "<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+CPAP_CSR+"' title='"+schema::channel[CPAP_CSR].description()+"'>"+tr("PB/CSR")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",csr)+"%</td></tr>\n"
             "</table></td>";
         } else if (cpap->machine->GetClass()=="Intellipap") {
             html+="<td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>"
-            "<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event=NRI'>"+tr("NRI")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",nri)+"</td></tr>\n"
-            "<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event=Leak'>"+tr("Leak Idx")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",lki)+"</font></td></tr>\n"
-            "<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event=VSnore'>"+tr("V.Snore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
-            "<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event=ExP'>"+tr("Exh.&nbsp;Puff")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",exp)+"</td></tr>\n"
+            "<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+CPAP_NRI+"'>"+tr("NRI")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",nri)+"</td></tr>\n"
+            "<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+CPAP_Leak+"'>"+tr("Leak Idx")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",lki)+"</font></td></tr>\n"
+            "<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+CPAP_VSnore+"'>"+tr("V.Snore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
+            "<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+CPAP_ExP+"'>"+tr("Exh.&nbsp;Puff")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",exp)+"</td></tr>\n"
             "</table></td>";
 
         }
@@ -801,13 +819,19 @@ void Daily::Load(QDate date)
         html+="<tr><td align=center>SessionID</td><td align=center>Date</td><td align=center>Start</td><td align=center>End</td></tr>";
         QDateTime fd,ld;
         bool corrupted_waveform=false;
+        QString tooltip;
         if (cpap) {
             for (QVector<Session *>::iterator s=cpap->begin();s!=cpap->end();s++) {
                 fd=QDateTime::fromTime_t((*s)->first()/1000L);
                 ld=QDateTime::fromTime_t((*s)->last()/1000L);
+                int len=(*s)->length()/1000L;
+                int h=len/3600;
+                int m=(len/60) % 60;
+                int s1=len % 60;
                 QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find("BrokenWaveform");
+                tooltip=cpap->machine->GetClass()+" CPAP "+QString().sprintf("%2ih&nbsp;%2im&nbsp;%2is",h,m,s1);
                 if ((i!=(*s)->settings.end()) && i.value().toBool()) corrupted_waveform=true;
-                tmp.sprintf(("<tr><td align=center><a href='cpap=%i'>%08i</a></td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session(),(*s)->session());
+                tmp.sprintf(("<tr><td align=center><a href='cpap=%i' title='"+tooltip+"'>%08i</a></td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session(),(*s)->session());
                 html+=tmp;
             }
         }
@@ -815,9 +839,14 @@ void Daily::Load(QDate date)
             for (QVector<Session *>::iterator s=oxi->begin();s!=oxi->end();s++) {
                 fd=QDateTime::fromTime_t((*s)->first()/1000L);
                 ld=QDateTime::fromTime_t((*s)->last()/1000L);
+                int len=(*s)->length()/1000L;
+                int h=len/3600;
+                int m=(len/60) % 60;
+                int s1=len % 60;
                 QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find("BrokenWaveform");
+                tooltip=oxi->machine->GetClass()+" Oximeter "+QString().sprintf("%2ih,&nbsp;%2im,&nbsp;%2is",h,m,s1);
                 if ((i!=(*s)->settings.end()) && i.value().toBool()) corrupted_waveform=true;
-                tmp.sprintf(("<tr><td align=center><a href='oxi=%i'>%08i</a></td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session(),(*s)->session());
+                tmp.sprintf(("<tr><td align=center><a href='oxi=%i' title='"+tooltip+"'>%08i</a></td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session(),(*s)->session());
                 html+=tmp;
             }
         }
diff --git a/daily.h b/daily.h
index ec390dc6..8bb3cb53 100644
--- a/daily.h
+++ b/daily.h
@@ -70,12 +70,12 @@ private slots:
 
     void on_todayButton_clicked();
 
-    void on_Link_clicked(const QUrl &url);
+    void Link_clicked(const QUrl &url);
     void on_evViewSlider_valueChanged(int value);
 
     void on_treeWidget_itemClicked(QTreeWidgetItem *item, int column);
 
-    void on_graphtogglebutton_toggled(bool);
+    void graphtogglebutton_toggled(bool);
     void on_ZombieMeter_actionTriggered(int action);
 
     void on_addBookmarkButton_clicked();
diff --git a/docs/channels.xml b/docs/channels.xml
index 9ba6b5bc..633e276c 100644
--- a/docs/channels.xml
+++ b/docs/channels.xml
@@ -8,19 +8,19 @@ One id code per item
 <channels language="en" version="1.0">
  <group name="CPAP">
   <!-- Channel List -->
-  <channel id="0x1000" class="data" name="CSR" details="Cheyne Stokes Respiration" label="CSR" color="light green"/>
-  <channel id="0x1001" class="data" name="ClearAirway" details="Clear Airway Apnea" label="CA" color="purple"/>
-  <channel id="0x1002" class="data" name="Obstructive" details="Obstructive Apnea" label="OA" color="#40c0ff"/>
-  <channel id="0x1003" class="data" name="Hypopnea" details="Hypopnea" label="H" color="blue"/>
-  <channel id="0x1004" class="data" name="Apnea" details="Unspecified Apnea" label="UA" color="dark green"/>
-  <channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" color="dark grey"/>
-  <channel id="0x1006" class="data" name="RERA" details="Respiratory Effort Related Arousal" label="RERA" color="gold"/>
-  <channel id="0x1007" class="data" name="VSnore" details="Vibratory Snore" label="VS" unit="" color="red"/>
-  <channel id="0x1008" class="data" name="VSnore2" details="Vibratory Snore 2" label="VS2" unit="" color="orange"/>
-  <channel id="0x1009" class="data" name="PressurePulse" details="Pressure Pulse" label="PP" color="dark red"/>
-  <channel id="0x100a" class="data" name="LeakFlag" details="Leak Event" label="L" unit="" color="dark blue"/>
-  <channel id="0x100b" class="data" name="NRI" details="Non-Responding Event" label="NRI" unit="" color="orange"/>
-  <channel id="0x100c" class="data" name="EP" details="Exhale Puff" label="EP" unit="" color="dark magenta"/>
+  <channel id="0x1000" class="data" name="CSR" details="Periodic Breathing" label="PB" unit="% of night" color="light green"/>
+  <channel id="0x1001" class="data" name="ClearAirway" details="Clear Airway Apnea" label="CA" unit="events/hour" color="purple"/>
+  <channel id="0x1002" class="data" name="Obstructive" details="Obstructive Apnea" label="OA" unit="events/hour" color="#40c0ff"/>
+  <channel id="0x1003" class="data" name="Hypopnea" details="Hypopnea" label="H" unit="events/hour" color="blue"/>
+  <channel id="0x1004" class="data" name="Apnea" details="Unspecified Apnea" label="UA" unit="events/hour" color="dark green"/>
+  <channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" unit="events/hour" color="dark grey"/>
+  <channel id="0x1006" class="data" name="RERA" details="Respiratory Effort Related Arousal" unit="events/hour" label="RERA" color="gold"/>
+  <channel id="0x1007" class="data" name="VSnore" details="Vibratory Snore" label="VS" unit="events/hour" color="red"/>
+  <channel id="0x1008" class="data" name="VSnore2" details="Vibratory Snore 2" label="VS2" unit="events/hour" color="orange"/>
+  <channel id="0x1009" class="data" name="PressurePulse" details="Pressure Pulse" unit="events/hour" color="dark red"/>
+  <channel id="0x100a" class="data" name="LeakFlag" details="Leak Event" label="L" unit="events/hour" color="dark blue"/>
+  <channel id="0x100b" class="data" name="NRI" details="Non-Responding Event" unit="events/hour" color="orange"/>
+  <channel id="0x100c" class="data" name="EP" details="Exhale Puff" label="EP" unit="events/hour" color="dark magenta"/>
 
   <channel id="0x1020" class="data" name="PressureMin" details="Min Therapy Pressure" label="PMin" color="black"/>
   <channel id="0x1021" class="data" name="PressureMax" details="Max Therapy Pressure" label="PMax" color="black"/>
@@ -29,7 +29,7 @@ One id code per item
 
   <channel id="0x1100" class="data" name="FlowRate" details="Flow Rate" label="Flow Rate" unit="L/min" color="black"/>
   <channel id="0x1101" class="data" name="MaskPressure" details="Mask Pressure" label="Mask Pressure" unit="cmH20" color="blue"/>
-  <channel id="0x1102" class="data" name="MaskPressureHi" details="Mask Pressure" label="Mask Pressure" unit="cmH20" color="blue" link="0x1101"/>
+  <channel id="0x1102" class="data" name="MaskPressureHi" details="Mask Pressure" label="Mask Pressure (Hi-Res)" unit="cmH20" color="blue" link="0x1101"/>
   <channel id="0x1103" class="data" name="TidalVolume" details="Tidal Volume" label="Tidal Volume" unit="ml" color="magenta"/>
   <channel id="0x1104" class="data" name="Snore" details="Snore" label="Snore" unit="" color="grey"/>
   <channel id="0x1105" class="data" name="MinuteVent" details="Minute Ventilation" label="Minute Vent." unit="" color="dark cyan"/>
@@ -46,21 +46,21 @@ One id code per item
   <channel id="0x1110" class="data" name="IPAPLo" details="Inspiratory Pressure Lo" label="IPAP Lo" unit="cmH20" color="grey"/>
   <channel id="0x1111" class="data" name="IPAPHi" details="Inspiratory Pressure Hi" label="IPAP Hi" unit="cmH20" color="grey"/>
   <channel id="0x1112" class="data" name="RespEvent" details="Respiratory Events" label="Resp Events" unit="" color="black"/>
-  <channel id="0x1113" class="data" name="FLG" details="Flow Limit Graph" label="Flow Limit" unit="" color="dark grey"/>
+  <channel id="0x1113" class="data" name="FLG" details="Flow Limit Graph" label="Flow Limit" unit="0&lt;n&lt;1" color="dark grey"/>
   <channel id="0x1114" class="data" name="TgMV" details="Target Minute Ventilation" label="Trgt Min Vent." unit="" color="dark cyan"/>
   <channel id="0x1115" class="data" name="MaxLeak" details="Maximum Leak" label="MaxLeaks" unit="L/min" color="dark red"/>
-  <channel id="0x1116" class="data" name="AHI" details="AHI/Hour" label="AHI/Hr" unit="events/hr" color="dark red"/>
+  <channel id="0x1116" class="data" name="AHI" details="Apnea/Hypopnea Index" label="AHI/Hr" unit="events/hr" color="dark red"/>
   <channel id="0x1117" class="data" name="LeakTotal" details="Total Leak Rate" label="Total Leaks" unit="L/min" color="dark green"/>
 
-  <channel id="0x1150" class="data" name="PRS1_00" details="Unknown 00" label="U00" unit="" color="black"/>
-  <channel id="0x1151" class="data" name="PRS1_01" details="Unknown 01" label="U01" unit="" color="black"/>
-  <channel id="0x1152" class="data" name="PRS1_08" details="Unknown 08" label="U08" unit="" color="black"/>
-  <channel id="0x1153" class="data" name="PRS1_09" details="Unknown 09" label="U09" unit="" color="black"/>
-  <channel id="0x1154" class="data" name="PRS1_0A" details="Unknown 0A" label="U0A" unit="" color="black"/>
-  <channel id="0x1155" class="data" name="PRS1_0B" details="Unknown 0B" label="U0B" unit="" color="light blue"/>
-  <channel id="0x1156" class="data" name="PRS1_0C" details="Unknown 0C" label="U0C" unit="" color="black"/>
-  <channel id="0x1157" class="data" name="PRS1_0E" details="Unknown 0E" label="U0E" unit="" color="dark green"/>
-  <channel id="0x1158" class="data" name="PRS1_10" details="Unknown 10" label="U10" unit="" color="black"/>
+  <channel id="0x1150" class="data" name="PRS1_00" details="Unknown 00" label="U00" unit="?" color="black"/>
+  <channel id="0x1151" class="data" name="PRS1_01" details="Unknown 01" label="U01" unit="?" color="black"/>
+  <channel id="0x1152" class="data" name="PRS1_08" details="Unknown 08" label="U08" unit="?" color="black"/>
+  <channel id="0x1153" class="data" name="PRS1_09" details="Unknown 09" label="U09" unit="?" color="black"/>
+  <channel id="0x1154" class="data" name="PRS1_0A" details="Unknown 0A" label="U0A" unit="?" color="black"/>
+  <channel id="0x1155" class="data" name="PRS1_0B" details="Unknown 0B" label="U0B" unit="?" color="light blue"/>
+  <channel id="0x1156" class="data" name="PRS1_0C" details="Unknown 0C" label="U0C" unit="?" color="black"/>
+  <channel id="0x1157" class="data" name="PRS1_0E" details="Unknown 0E" label="U0E" unit="?" color="dark green"/>
+  <channel id="0x1158" class="data" name="PRS1_10" details="Unknown 10" label="U10" unit="?" color="black"/>
   <channel id="0x1159" class="data" name="PRS1_12" details="PRS1 Unknown 12" label="U12" unit="" color="black"/>
   <channel id="0x1160" class="data" name="RMS9_E01" details="RMS9 Empty 1" label="E01" unit="" color="black"/>
   <channel id="0x1161" class="data" name="RMS9_E02" details="RMS9 Empty 2" label="U02" unit="" color="black"/>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index df4aa118..ef60b198 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -188,12 +188,12 @@ MainWindow::~MainWindow()
     mainwin=NULL;
     delete ui;
 }
-void MainWindow::Notify(QString s)
+void MainWindow::Notify(QString s,int ms)
 {
     if (systray) {
-        systray->showMessage("SleepyHead v"+PREF["VersionString"].toString(),s,QSystemTrayIcon::Information,5000);
+        systray->showMessage("SleepyHead v"+PREF["VersionString"].toString(),s,QSystemTrayIcon::Information,ms);
     } else {
-        ui->statusbar->showMessage(s,5000);
+        ui->statusbar->showMessage(s,ms);
     }
 }
 
diff --git a/mainwindow.h b/mainwindow.h
index fe847e2e..cea29be1 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -44,7 +44,7 @@ public:
     void Log(QString s);
     QMenu * CreateMenu(QString title);
     void CheckForUpdates();
-    void Notify(QString s);
+    void Notify(QString s,int ms=5000);
     gGraphView *snapshotGraph() { return SnapshotGraph; }
     Daily *getDaily() { return daily; }
     Overview *getOverview() { return overview; }
diff --git a/oximetry.cpp b/oximetry.cpp
index 1ff1b07f..49832723 100644
--- a/oximetry.cpp
+++ b/oximetry.cpp
@@ -156,7 +156,7 @@ void SerialOximeter::setStopBits(StopBitsType stopbits)
     m_stopbits=stopbits;
 }
 
-void SerialOximeter::onReadyRead()
+void SerialOximeter::ReadyRead()
 {
     int i=5;
     qDebug() << "Foo"  << i;
@@ -363,7 +363,7 @@ CMS50Serial::~CMS50Serial()
 {
 }
 
-void CMS50Serial::on_import_process()
+void CMS50Serial::import_process()
 {
     qDebug() << "CMS50 import complete. Processing" << data.size() << "bytes";
     unsigned char a,pl,o2,lastpl=0,lasto2=0;
@@ -462,10 +462,10 @@ void CMS50Serial::on_import_process()
     session->setCount(OXI_SPO2,o2cnt);
     session->UpdateSummaries();
     emit(importComplete(session));
-    disconnect(this,SIGNAL(importProcess()),this,SLOT(on_import_process()));
+    disconnect(this,SIGNAL(importProcess()),this,SLOT(import_process()));
 }
 
-void CMS50Serial::onReadyRead()
+void CMS50Serial::ReadyRead()
 {
     QByteArray bytes;
     int a = m_port->bytesAvailable();
@@ -621,7 +621,7 @@ bool CMS50Serial::startImport()
     failcnt=0;
     //QMessageBox::information(0,"!!!Important Notice!!!","This Oximetry import method does NOT allow syncing of Oximetry and CPAP data.\nIf you really wish to record your oximetry data and have sync, you have to use the Live View mode (click Start) with the Oximeter connected to a computer via USB cable all night..\nEven then it will be out a bit because of your CPAP machines realtime clock drifts.",QMessageBox::Ok);
     if (!Open(QextSerialPort::EventDriven)) return false;
-    connect(this,SIGNAL(importProcess()),this,SLOT(on_import_process()));
+    connect(this,SIGNAL(importProcess()),this,SLOT(import_process()));
 
     createSession();
 
@@ -789,15 +789,15 @@ void Oximetry::on_SerialPortsCombo_activated(const QString &arg1)
     oximeter->setPortName(arg1);
 }
 
-void Oximetry::on_RunButton_toggled(bool checked)
+void Oximetry::RunButton_toggled(bool checked)
 {
     if (!checked) {
             oximeter->stopLive();
             ui->RunButton->setText("&Start");
             ui->SerialPortsCombo->setEnabled(true);
-            disconnect(oximeter,SIGNAL(dataChanged()),this,SLOT(onDataChanged()));
-            disconnect(oximeter,SIGNAL(updatePulse(float)),this,SLOT(onPulseChanged(float)));
-            disconnect(oximeter,SIGNAL(updateSpO2(float)),this,SLOT(onSpO2Changed(float)));
+            disconnect(oximeter,SIGNAL(dataChanged()),this,SLOT(DataChanged()));
+            disconnect(oximeter,SIGNAL(updatePulse(float)),this,SLOT(PulseChanged(float)));
+            disconnect(oximeter,SIGNAL(updateSpO2(float)),this,SLOT(SpO2Changed(float)));
             ui->saveButton->setEnabled(true);
             ui->ImportButton->setEnabled(true);
             lo2->SetDay(day);
@@ -860,9 +860,9 @@ void Oximetry::on_RunButton_toggled(bool checked)
         SPO2->setForceMinY(50);
         SPO2->setForceMaxY(100); */
 
-        connect(oximeter,SIGNAL(dataChanged()),this,SLOT(onDataChanged()));
-        connect(oximeter,SIGNAL(updatePulse(float)),this,SLOT(onPulseChanged(float)));
-        connect(oximeter,SIGNAL(updateSpO2(float)),this,SLOT(onSpO2Changed(float)));
+        connect(oximeter,SIGNAL(dataChanged()),this,SLOT(DataChanged()));
+        connect(oximeter,SIGNAL(updatePulse(float)),this,SLOT(PulseChanged(float)));
+        connect(oximeter,SIGNAL(updateSpO2(float)),this,SLOT(SpO2Changed(float)));
         CONTROL->setVisible(false);
         // connect.
         ui->RunButton->setText("&Stop");
@@ -871,7 +871,7 @@ void Oximetry::on_RunButton_toggled(bool checked)
     }
 
 }
-void Oximetry::onDataChanged()
+void Oximetry::DataChanged()
 {
 
     qint64 last=oximeter->lastTime();
@@ -968,9 +968,9 @@ void Oximetry::oximeter_running_check()
 // Move this code to CMS50 Importer??
 void Oximetry::on_ImportButton_clicked()
 {
-    connect(oximeter,SIGNAL(importComplete(Session*)),this,SLOT(on_import_complete(Session*)));
-    connect(oximeter,SIGNAL(importAborted()),this,SLOT(on_import_aborted()));
-    connect(oximeter,SIGNAL(updateProgress(float)),this,SLOT(on_updateProgress(float)));
+    connect(oximeter,SIGNAL(importComplete(Session*)),this,SLOT(import_complete(Session*)));
+    connect(oximeter,SIGNAL(importAborted()),this,SLOT(import_aborted()));
+    connect(oximeter,SIGNAL(updateProgress(float)),this,SLOT(updateProgress(float)));
     //connect(oximeter,SIGNAL(dataChanged()),this,SLOT(onDataChanged()));
 
     if (!oximeter->startImport()) {
@@ -996,10 +996,10 @@ void Oximetry::on_ImportButton_clicked()
 
 void Oximetry::import_finished()
 {
-    disconnect(oximeter,SIGNAL(importComplete(Session*)),this,SLOT(on_import_complete(Session*)));
-    disconnect(oximeter,SIGNAL(importAborted()),this,SLOT(on_import_aborted()));
-    disconnect(oximeter,SIGNAL(updateProgress(float)),this,SLOT(on_updateProgress(float)));
-    //disconnect(oximeter,SIGNAL(dataChanged()),this,SLOT(onDataChanged()));
+    disconnect(oximeter,SIGNAL(importComplete(Session*)),this,SLOT(import_complete(Session*)));
+    disconnect(oximeter,SIGNAL(importAborted()),this,SLOT(import_aborted()));
+    disconnect(oximeter,SIGNAL(updateProgress(float)),this,SLOT(updateProgress(float)));
+    //disconnect(oximeter,SIGNAL(dataChanged()),this,SLOT(DataChanged()));
 
     ui->SerialPortsCombo->setEnabled(true);
     qstatus->setText("Ready");
@@ -1013,14 +1013,14 @@ void Oximetry::import_finished()
     }
 }
 
-void Oximetry::on_import_aborted()
+void Oximetry::import_aborted()
 {
     //QMessageBox::warning(mainwin,"Oximeter Error","Please make sure your oximeter is switched on, and able to transmit data.\n(You may need to enter the oximeters Settings screen for it to be able to transmit.)",QMessageBox::Ok);
     mainwin->Notify("Oximeter Error!\n\nPlease make sure your oximeter is switched on, and in the right mode to transmit data.");
     //qDebug() << "Oximetry import failed";
     import_finished();
 }
-void Oximetry::on_import_complete(Session * session)
+void Oximetry::import_complete(Session * session)
 {
     qDebug() << "Oximetry import complete";
     import_finished();
@@ -1085,7 +1085,7 @@ void Oximetry::on_import_complete(Session * session)
 
 }
 
-void Oximetry::onPulseChanged(float p)
+void Oximetry::PulseChanged(float p)
 {
     ui->pulseLCD->display(p);
     return;
@@ -1100,7 +1100,7 @@ void Oximetry::onPulseChanged(float p)
 }
 
 // Only really need to do this once..
-void Oximetry::onSpO2Changed(float o2)
+void Oximetry::SpO2Changed(float o2)
 {
     ui->spo2LCD->display(o2);
     return;
@@ -1129,7 +1129,7 @@ void Oximetry::on_saveButton_clicked()
         GraphView->updateGL();
     }
 }
-void Oximetry::on_updateProgress(float f)
+void Oximetry::updateProgress(float f)
 {
     if (qprogress) {
         qprogress->setValue(f*100.0);
diff --git a/oximetry.h b/oximetry.h
index e974e65e..38bde804 100644
--- a/oximetry.h
+++ b/oximetry.h
@@ -84,8 +84,8 @@ signals:
     void updateSpO2(float p);
 
 protected slots:
-    virtual void onReadyRead();
-    virtual void on_import_process()=0;
+    virtual void ReadyRead();
+    virtual void import_process()=0;
 
 
 protected:
@@ -128,9 +128,9 @@ public:
     virtual bool startImport();
 
 protected:
-    virtual void on_import_process();
+    virtual void import_process();
 
-    virtual void onReadyRead();
+    virtual void ReadyRead();
     bool waitf6;
     short cntf6;
     short failcnt;
@@ -163,7 +163,7 @@ public:
 
 private slots:
     void on_RefreshPortsButton_clicked();
-    void on_RunButton_toggled(bool checked);
+    void RunButton_toggled(bool checked);
 
     void on_SerialPortsCombo_activated(const QString &arg1);
     //void onReadyRead();
@@ -171,14 +171,14 @@ private slots:
 
     void on_ImportButton_clicked();
 
-    void onDataChanged();
-    void onPulseChanged(float p);
-    void onSpO2Changed(float o2);
+    void DataChanged();
+    void PulseChanged(float p);
+    void SpO2Changed(float o2);
 
     void on_saveButton_clicked();
-    void on_updateProgress(float f);
-    void on_import_aborted();
-    void on_import_complete(Session *session);
+    void updateProgress(float f);
+    void import_aborted();
+    void import_complete(Session *session);
 
     void oximeter_running_check();