diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp
index 0bf4e61d..4518ef00 100644
--- a/Graphs/gBarChart.cpp
+++ b/Graphs/gBarChart.cpp
@@ -27,14 +27,14 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
    // if (!data) return;
    //if (!data->IsReady()) return;
 
-    int start_px=left;
-    int start_py=top;
+    //int start_px=left;
+    //int start_py=top;
 
-    double xx=w.max_x - w.min_x;
-    double days=int(xx);
+    //double xx=w.max_x - w.min_x;
+    //double days=int(xx);
     //days=data->np[0];
 
-    days=0;
+    //days=0;
 /*    for (int i=0;i<data->np[0];i++) {
        if ((data->point[0][i].x() >= w.min_x) && (data->point[0][i].x()<w.max_x)) days+=1;
     }
diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index 65373726..c5f2d8e3 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -157,18 +157,19 @@ void Layer::drawGLBuf()
 
 void Layer::SetDay(Day * d)
 {
-    m_day=d;
-    if (!d) return;
+    if (d && m_code!=EmptyChannel) {
+        m_day=d;
+        m_minx=d->first(m_code);
+        m_maxx=d->last(m_code);
+        m_miny=d->min(m_code);
+        m_maxy=d->max(m_code);
+    } else m_day=NULL;
 
-    m_minx=d->first(m_code);
-    m_maxx=d->last(m_code);
-    m_miny=d->min(m_code);
-    m_maxy=d->max(m_code);
 }
 
 bool Layer::isEmpty()
 {
-    if (m_day && (m_day->count(m_code)!=0))
+    if (m_day && (m_day->count(m_code)>0))
         return false;
     return true;
 }
@@ -209,10 +210,10 @@ void LayerGroup::drawGLBuf()
 
 void LayerGroup::SetDay(Day * d)
 {
+    m_day=d;
     for (int i=0;i<layers.size();i++) {
          layers[i]->SetDay(d);
     }
-    m_day=d;
 }
 
 void LayerGroup::AddLayer(Layer *l)
@@ -326,6 +327,15 @@ void gGraph::drawGLBuf()
         m_layers[i]->drawGLBuf();
     }
 }
+void gGraph::setDay(Day * day)
+{
+    m_day=day;
+    for (int i=0;i<m_layers.size();i++) {
+        m_layers[i]->SetDay(day);
+    }
+    ResetBounds();
+}
+
 /*void gGraph::invalidate()
 { // this may not be necessary, as scrollbar & resize issues a full redraw..
 
@@ -1146,6 +1156,7 @@ void gGraphView::paintGL()
     float h,w;
     //ax=px;//-m_offsetX;
 
+
     for (int i=0;i<m_graphs.size();i++) {
         if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible()) continue;
         numgraphs++;
@@ -1479,6 +1490,13 @@ void gGraphView::keyPressEvent(QKeyEvent * event)
 {
 
 }
+void gGraphView::setDay(Day * day)
+{
+    m_day=day;
+    for (int i=0;i<m_graphs.size();i++) {
+        m_graphs[i]->setDay(day);
+    }
+}
 
 MyScrollBar::MyScrollBar(QWidget * parent)
     :QScrollBar(parent)
diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h
index 1b832552..db80b7c8 100644
--- a/Graphs/gGraphView.h
+++ b/Graphs/gGraphView.h
@@ -114,7 +114,7 @@ public:
     //void Y() { return m_Y; }
 
 
-    void drawGLBuf();
+    virtual void drawGLBuf();
 protected:
     void addGLBuf(GLBuffer *buf) { mgl_buffers.push_back(buf); }
     //QRect bounds; // bounds, relative to top of individual graph.
@@ -146,7 +146,7 @@ public:
     virtual EventDataType Maxy();
     virtual bool isEmpty();
     virtual void SetDay(Day * d);
-    void drawGLBuf();
+    virtual void drawGLBuf();
 
 protected:
     QVector<Layer *> layers;
@@ -209,6 +209,7 @@ public:
     void setGroup(short group) { m_group=group; }
     void DrawTextQue();
     void DrawStaticText(QStaticText & text, short x, short y);
+    void setDay(Day * day);
 protected:
     virtual void paint(int originX, int originY, int width, int height);
     //void invalidate();
@@ -240,6 +241,7 @@ protected:
     QPoint m_current;
     short m_group;
     short m_lastx23;
+    Day * m_day;
 };
 
 class gGraphView : public QGLWidget
@@ -283,9 +285,10 @@ public:
     void updateScale();         // update scale & Scrollbar
     void setEmptyText(QString s) { m_emptytext=s; }
     QMutex text_mutex;
+    void setDay(Day * day);
 protected:
 
-
+    Day * m_day;
     float totalHeight();
     float scaleHeight();
 
diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp
index 522ae007..472b37fb 100644
--- a/Graphs/gXAxis.cpp
+++ b/Graphs/gXAxis.cpp
@@ -40,7 +40,7 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
     double px,py;
 
     int start_px=left;
-    int start_py=top;
+    //int start_py=top;
     //int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
 //    float height=scry-(w.GetTopMargin()+w.GetBottomMargin());
 
diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp
index 62535190..138c740b 100644
--- a/Graphs/gYAxis.cpp
+++ b/Graphs/gYAxis.cpp
@@ -115,7 +115,7 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
         min_ytick=100;
     }
 
-    double q=((maxy-(miny+(min_ytick/2.0)))/min_ytick)*4;
+    //double q=((maxy-(miny+(min_ytick/2.0)))/min_ytick)*4;
     //if (q>=maxverts) {
     //    qDebug() << "Would exeed maxverts. Should be another two bounds exceeded messages after this. (I can do a minor optimisation by disabling the other checks if this turns out to be consistent)" << q << maxverts;
     //}
@@ -288,7 +288,7 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
         min_ytick=100;
     }
 
-    double q=((maxy-(miny+(min_ytick/2.0)))/min_ytick)*4;
+    //double q=((maxy-(miny+(min_ytick/2.0)))/min_ytick)*4;
     /*if (q>=maxverts) {
         qDebug() << "Would exeed maxverts. Should be another two bounds exceeded messages after this. (I can do a minor optimisation by disabling the other checks if this turns out to be consistent)" << q << maxverts;
     }*/