diff --git a/src/libprojectM/PipelineMerger.cpp b/src/libprojectM/PipelineMerger.cpp
index dcf454aea..3046cb20d 100644
--- a/src/libprojectM/PipelineMerger.cpp
+++ b/src/libprojectM/PipelineMerger.cpp
@@ -33,24 +33,21 @@ void PipelineMerger::mergePipelines(const Pipeline & a, const Pipeline & b, Pipe
 		   out.drawables.push_back(*pos);
 		}
 
-    if (ratio < 0.5)
-    {
+
     for (std::vector<RenderItem*>::const_iterator pos = a.compositeDrawables.begin();
     pos != a.compositeDrawables.end(); ++pos)
     {
-        //(*pos)->masterAlpha = invratio;
+        (*pos)->masterAlpha = invratio;
         out.compositeDrawables.push_back(*pos);
     }
-    }
-    else
-    {
+
     for (std::vector<RenderItem*>::const_iterator pos = b.compositeDrawables.begin();
     pos != b.compositeDrawables.end();++pos)
     {
-        //(*pos)->masterAlpha = ratio;
+        (*pos)->masterAlpha = ratio;
         out.compositeDrawables.push_back(*pos);
     }
-    }
+
 
 	/*
 	for (RenderItemMatchList::iterator pos = results.matches.begin(); pos != results.matches.end(); ++pos) {
diff --git a/src/libprojectM/Renderer/VideoEcho.cpp b/src/libprojectM/Renderer/VideoEcho.cpp
index 185103caf..36061a256 100644
--- a/src/libprojectM/Renderer/VideoEcho.cpp
+++ b/src/libprojectM/Renderer/VideoEcho.cpp
@@ -59,7 +59,7 @@ void VideoEcho::Draw(RenderContext &context)
 		glMatrixMode(GL_TEXTURE);
 
 		//draw video echo
-		glColor4f(1.0, 1.0, 1.0, a);
+		glColor4f(1.0, 1.0, 1.0, a * masterAlpha);
 		glTranslatef(.5, .5, 0);
 		glScalef(1.0/zoom, 1.0/zoom, 1);
 		glTranslatef(-.5, -.5, 0);
diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp
index 4de2acab1..4c2693135 100755
--- a/src/libprojectM/projectM.cpp
+++ b/src/libprojectM/projectM.cpp
@@ -382,7 +382,6 @@ static void *thread_callback(void *prjm) {
                                             m_activePreset2->pipeline(), pipeline, _matcher->matchResults(),
                                             *_merger, timeKeeper->SmoothRatio());
 
-            /// @bug not sure if this is correct
             renderer->RenderFrame(pipeline, pipelineContext());
 
             for (int i = 0; i < _matcher->matchResults().matches.size(); i++) {
@@ -400,12 +399,7 @@ static void *thread_callback(void *prjm) {
             }
             //printf("Normal\n");
 
-
             m_activePreset->Render(*beatDetect, pipelineContext());
-
-            //		m_activePreset->evaluateFrame();
-            //		m_activePreset->presetOutputs().Render(*beatDetect,presetInputs);
-
             renderer->RenderFrame (m_activePreset->pipeline(), pipelineContext());
         }