diff --git a/sleepyhead/Graphs/gFlagsLine.cpp b/sleepyhead/Graphs/gFlagsLine.cpp
index 288cbba0..a95867c4 100644
--- a/sleepyhead/Graphs/gFlagsLine.cpp
+++ b/sleepyhead/Graphs/gFlagsLine.cpp
@@ -374,9 +374,16 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
                         painter.drawRect(x2, bartop, x1-x2, bottom-bartop);
                         int x,y;
-                        QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(*dptr);
+                        int s = *dptr;
+                        int m = s / 60;
+                        s %= 60;
+                        QString lab = QString("%1").arg(schema::channel[m_code].fullname());
+                        if (m>0) {
+                            lab += QObject::tr(" (%2 min, %3 sec)").arg(m).arg(s);
+                        } else {
+                            lab += QObject::tr(" (%3 sec)").arg(m).arg(s);
+                        }
                         GetTextExtent(lab, x, y);
-
                         w.ToolTip(lab, x2 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, p_profile->general->tooltipTimeout());
 
                     }
diff --git a/sleepyhead/SleepLib/schema.cpp b/sleepyhead/SleepLib/schema.cpp
index 97adb290..ab317d35 100644
--- a/sleepyhead/SleepLib/schema.cpp
+++ b/sleepyhead/SleepLib/schema.cpp
@@ -56,6 +56,24 @@ QHash<QString, ScopeType> Scopes;
 
 bool schema_initialized = false;
 
+void setOrders() {
+    schema::channel[CPAP_CSR].setOrder(1);
+    schema::channel[CPAP_Ramp].setOrder(2);
+    schema::channel[CPAP_LargeLeak].setOrder(2);
+    schema::channel[CPAP_ClearAirway].setOrder(3);
+    schema::channel[CPAP_Obstructive].setOrder(4);
+    schema::channel[CPAP_Apnea].setOrder(4);
+    schema::channel[CPAP_NRI].setOrder(3);
+    schema::channel[CPAP_Hypopnea].setOrder(5);
+    schema::channel[CPAP_FlowLimit].setOrder(6);
+    schema::channel[CPAP_RERA].setOrder(6);
+    schema::channel[CPAP_VSnore].setOrder(7);
+    schema::channel[CPAP_VSnore2].setOrder(8);
+    schema::channel[CPAP_ExP].setOrder(6);
+    schema::channel[CPAP_UserFlag1].setOrder(256);
+    schema::channel[CPAP_UserFlag2].setOrder(257);
+}
+
 void init()
 {
     if (schema_initialized) { return; }
@@ -164,9 +182,9 @@ void init()
 
     // Flags
     schema::channel.add(GRP_CPAP, new Channel(CPAP_CSR           = 0x1000, SPAN,    MT_CPAP, SESSION, "CSR",
-                        QObject::tr("Periodic Breathing"),
-                        QObject::tr("A period of periodic breathing"),
-                        QObject::tr("PB"),       STR_UNIT_Percentage,            DEFAULT,    COLOR_CSR));
+                        QObject::tr("Cheyne Stokes Respiration"),
+                        QObject::tr("An abnormal period of Periodic Breathing/Cheyne Stokes Respiration"),
+                        QObject::tr("CSR"),       STR_UNIT_Percentage,            DEFAULT,    COLOR_CSR));
 
 
     schema::channel.add(GRP_CPAP, new Channel(CPAP_ClearAirway   = 0x1001, FLAG,    MT_CPAP, SESSION,
@@ -566,6 +584,7 @@ void resetChannels()
         MachineLoader * loader = list.at(i);
         loader->initChannels();
     }
+    setOrders();
 }
 
 Channel::Channel(ChannelID id, ChanType type, MachineType machtype, ScopeType scope, QString code, QString fullname,
diff --git a/sleepyhead/SleepLib/schema.h b/sleepyhead/SleepLib/schema.h
index c85353d4..6934eeae 100644
--- a/sleepyhead/SleepLib/schema.h
+++ b/sleepyhead/SleepLib/schema.h
@@ -55,6 +55,8 @@ public:
 
 namespace schema {
 void resetChannels();
+void setOrders();
+
 
 enum Function {
     NONE = 0, AVG, WAVG, MIN, MAX, SUM, CNT, P90, CPH, SPH, HOURS, SET
diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp
index 202f62a8..c41841c1 100644
--- a/sleepyhead/main.cpp
+++ b/sleepyhead/main.cpp
@@ -59,24 +59,6 @@ void initialize()
     schema::init();
 }
 
-void setOrders() {
-    schema::channel[CPAP_CSR].setOrder(1);
-    schema::channel[CPAP_Ramp].setOrder(2);
-    schema::channel[CPAP_LargeLeak].setOrder(2);
-    schema::channel[CPAP_ClearAirway].setOrder(3);
-    schema::channel[CPAP_Obstructive].setOrder(4);
-    schema::channel[CPAP_Apnea].setOrder(4);
-    schema::channel[CPAP_NRI].setOrder(3);
-    schema::channel[CPAP_Hypopnea].setOrder(5);
-    schema::channel[CPAP_FlowLimit].setOrder(6);
-    schema::channel[CPAP_RERA].setOrder(6);
-    schema::channel[CPAP_VSnore].setOrder(7);
-    schema::channel[CPAP_VSnore2].setOrder(8);
-    schema::channel[CPAP_ExP].setOrder(6);
-    schema::channel[CPAP_UserFlag1].setOrder(256);
-    schema::channel[CPAP_UserFlag2].setOrder(257);
-}
-
 void release_notes()
 {
     QDialog relnotes;
@@ -292,7 +274,7 @@ retry_directory:
     MD300W1Loader::Register();
     //ZEOLoader::Register(); // Use outside of directory importer..
 
-    setOrders();
+    schema::setOrders();
 
     p_pref = new Preferences("Preferences");
     p_layout = new Preferences("Layout");