diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index f2ec1e0..ee27f37 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -842,9 +842,9 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
     wproc->setBandwidth(waterfallCanvas->getBandwidth());
     wproc->setCenterFrequency(waterfallCanvas->getCenterFrequency());
     
-    waterfallCanvas->processInputQueue();
+//    waterfallCanvas->processInputQueue();
 //    waterfallCanvas->Refresh();
-    demodWaterfallCanvas->processInputQueue();
+//    demodWaterfallCanvas->processInputQueue();
 //    demodWaterfallCanvas->Refresh();
 
     if (!this->IsActive()) {
diff --git a/src/visual/MeterCanvas.cpp b/src/visual/MeterCanvas.cpp
index 6986788..4fe5e14 100644
--- a/src/visual/MeterCanvas.cpp
+++ b/src/visual/MeterCanvas.cpp
@@ -63,7 +63,6 @@ float MeterCanvas::getInputValue() {
 
 void MeterCanvas::setShowUserInput(bool showUserInput) {
     this->showUserInput = showUserInput;
-    Refresh();
 }
 
 void MeterCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
@@ -91,7 +90,11 @@ void MeterCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
 }
 
 void MeterCanvas::OnIdle(wxIdleEvent &event) {
-    event.Skip();
+	if (mouseTracker.mouseInView()) {
+	    Refresh();
+	} else {
+		event.Skip();
+	}
 }
 
 void MeterCanvas::OnMouseMoved(wxMouseEvent& event) {
@@ -104,7 +107,6 @@ void MeterCanvas::OnMouseMoved(wxMouseEvent& event) {
             setStatusText(helpTip);
         }
     }
-    Refresh();
 }
 
 void MeterCanvas::OnMouseDown(wxMouseEvent& event) {
diff --git a/src/visual/ModeSelectorCanvas.cpp b/src/visual/ModeSelectorCanvas.cpp
index 4364cf6..f52f533 100644
--- a/src/visual/ModeSelectorCanvas.cpp
+++ b/src/visual/ModeSelectorCanvas.cpp
@@ -79,19 +79,21 @@ void ModeSelectorCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
 }
 
 void ModeSelectorCanvas::OnIdle(wxIdleEvent &event) {
-    event.Skip();
+	if (mouseTracker.mouseInView()) {
+		Refresh();
+	} else {
+		event.Skip();
+	}
 }
 
 void ModeSelectorCanvas::OnMouseMoved(wxMouseEvent& event) {
     InteractiveCanvas::OnMouseMoved(event);
-    Refresh();
 }
 
 void ModeSelectorCanvas::OnMouseDown(wxMouseEvent& event) {
     InteractiveCanvas::OnMouseDown(event);
     mouseTracker.setHorizDragLock(true);
     mouseTracker.setVertDragLock(true);
-    Refresh();
 }
 
 void ModeSelectorCanvas::OnMouseWheelMoved(wxMouseEvent& event) {
diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp
index 84c450e..e683e71 100644
--- a/src/visual/WaterfallCanvas.cpp
+++ b/src/visual/WaterfallCanvas.cpp
@@ -107,14 +107,16 @@ void WaterfallCanvas::processInputQueue() {
                         vData->decRefCount();
                         processed = true;
                     }
+                    lpsIndex-=targetVis;
+                } else {
+                	break;
                 }
-                lpsIndex-=targetVis;
             }
         }
     }
-    if (processed) {
+//    if (processed) {
         Refresh();
-    }
+//    }
 }
 
 void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
@@ -428,10 +430,10 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
 }
 void WaterfallCanvas::OnIdle(wxIdleEvent &event) {
 //    Refresh();
-//    processInputQueue();
+    processInputQueue();
 //    Refresh();
-//    event.RequestMore();
-    event.Skip();
+    event.RequestMore();
+//    event.Skip();
 }
 
 void WaterfallCanvas::OnMouseMoved(wxMouseEvent& event) {