diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index bf7aaabc..e03d59f6 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -222,7 +222,7 @@ QString gLineChart::getMetaString(qint64 time)
     for (int i=0; i<m_codes.size(); ++i) {
         ChannelID code = m_codes[i];
         if (m_day->channelHasData(code)) {
-            val = m_day->lookupValue(code, time);
+            val = m_day->lookupValue(code, time, m_square_plot);
             lasttext += " "+QString("%1: %2 %3").arg(schema::channel[code].label()).arg(val,0,'f',2).arg(schema::channel[code].units());
 
             if (code == CPAP_IPAP) {
diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp
index 7dc29cc7..3bacc869 100644
--- a/sleepyhead/Graphs/gLineOverlay.cpp
+++ b/sleepyhead/Graphs/gLineOverlay.cpp
@@ -253,10 +253,11 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
                            // col = QColor("gold");
                             hover = true;
+                            painter.setPen(QPen(col,3));
                         } else {
                             painter.setPen(QPen(col,1));
-                            painter.drawLine(x1, top, x1, bottom);
                         }
+                        painter.drawLine(x1, top, x1, bottom);
                         if (xx < (3600000)) {
                             QString lab = QString("%1").arg(m_label);
                             GetTextExtent(lab, x, y);
diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp
index 9fb3093d..185846ae 100644
--- a/sleepyhead/SleepLib/day.cpp
+++ b/sleepyhead/SleepLib/day.cpp
@@ -70,7 +70,7 @@ EventDataType Day::countInsideSpan(ChannelID span, ChannelID code)
     return count;
 }
 
-EventDataType Day::lookupValue(ChannelID code, qint64 time)
+EventDataType Day::lookupValue(ChannelID code, qint64 time, bool square)
 {
     QList<Session *>::iterator end = sessions.end();
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
@@ -78,7 +78,7 @@ EventDataType Day::lookupValue(ChannelID code, qint64 time)
 
         if (sess.enabled()) {
             if ((time > sess.first()) && (time < sess.last())) {
-                return sess.SearchValue(code,time);
+                return sess.SearchValue(code,time,square);
             }
         }
     }
diff --git a/sleepyhead/SleepLib/day.h b/sleepyhead/SleepLib/day.h
index dbd05d52..da79e891 100644
--- a/sleepyhead/SleepLib/day.h
+++ b/sleepyhead/SleepLib/day.h
@@ -104,7 +104,7 @@ class Day
     EventDataType timeBelowThreshold(ChannelID code, EventDataType threshold);
 
     //! \brief Returns the value for Channel code at a given time
-    EventDataType lookupValue(ChannelID code, qint64 time);
+    EventDataType lookupValue(ChannelID code, qint64 time, bool square);
 
     //! \brief Returns the count of code events inside span flag event durations
     EventDataType countInsideSpan(ChannelID span, ChannelID code);
diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp
index 72e5416d..3af433a8 100644
--- a/sleepyhead/SleepLib/session.cpp
+++ b/sleepyhead/SleepLib/session.cpp
@@ -953,7 +953,7 @@ void Session::UpdateSummaries()
     }
 }
 
-EventDataType Session::SearchValue(ChannelID code, qint64 time)
+EventDataType Session::SearchValue(ChannelID code, qint64 time, bool square)
 {
     qint64 t1, t2, start;
     QHash<ChannelID, QVector<EventList *> >::iterator it;
@@ -996,22 +996,31 @@ EventDataType Session::SearchValue(ChannelID code, qint64 time)
                     start = el->first();
                     tptr = el->rawTime();
                     // TODO: square plots need fixing
-
-                    for (int j = 0; j < cnt-1; ++j) {
-                        tptr++;
-                        t2 = start + *tptr;
-                        if (t2 > time) {
-                            tptr--;
-                            t1 = start + *tptr;
-                            c = EventDataType(t2 - t1);
-                            d = EventDataType(t2 - time);
-                            e = d/c;
-                            a = el->data(j);
-                            b = el->data(j+1);
-                            if (a == b) {
-                                return a;
-                            } else {
-                                return b + ((a-b) * e);
+                    if (square) {
+                        for (int j = 0; j < cnt-1; ++j) {
+                            tptr++;
+                            t2 = start + *tptr;
+                            if (t2 > time) {
+                                return el->data(j);
+                            }
+                        }
+                    } else {
+                        for (int j = 0; j < cnt-1; ++j) {
+                            tptr++;
+                            t2 = start + *tptr;
+                            if (t2 > time) {
+                                tptr--;
+                                t1 = start + *tptr;
+                                c = EventDataType(t2 - t1);
+                                d = EventDataType(t2 - time);
+                                e = d/c;
+                                a = el->data(j);
+                                b = el->data(j+1);
+                                if (a == b) {
+                                    return a;
+                                } else {
+                                    return b + ((a-b) * e);
+                                }
                             }
                         }
                     }
diff --git a/sleepyhead/SleepLib/session.h b/sleepyhead/SleepLib/session.h
index 9dee3084..e1a830d8 100644
--- a/sleepyhead/SleepLib/session.h
+++ b/sleepyhead/SleepLib/session.h
@@ -65,7 +65,7 @@ class Session
     inline bool isEmpty() { return (s_first == s_last); }
 
     //! \brief Search for Event code happening at supplied time (ms since epoch)
-    EventDataType SearchValue(ChannelID code, qint64 time);
+    EventDataType SearchValue(ChannelID code, qint64 time, bool square);
 
     //! \brief Return the sessionID
     inline const SessionID &session() {