diff --git a/Source/AccessClass.cpp b/Source/AccessClass.cpp
index 7816f8245e9f56d42ae9bcfcf9bd2d50f17e59b5..71dcade70e470ecba0afed2e64d16b490d32452f 100644
--- a/Source/AccessClass.cpp
+++ b/Source/AccessClass.cpp
@@ -1,11 +1,24 @@
 /*
-  ==============================================================================
+    ------------------------------------------------------------------
 
-    AccessClass.cpp
-    Created: 1 Mar 2012 1:36:31pm
-    Author:  jsiegle
+    This file is part of the Open Ephys GUI
+    Copyright (C) 2012 Open Ephys
+
+    ------------------------------------------------------------------
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  ==============================================================================
 */
 
 #include "AccessClass.h"
diff --git a/Source/AccessClass.h b/Source/AccessClass.h
index 582112bdbafa3e731d00ce7669e1c8c0ef860edf..6f9b6b127d69d4842a40e781d9368bd665b53b2a 100644
--- a/Source/AccessClass.h
+++ b/Source/AccessClass.h
@@ -1,11 +1,24 @@
 /*
-  ==============================================================================
+    ------------------------------------------------------------------
 
-    AccessClass.h
-    Created: 1 Mar 2012 1:17:45pm
-    Author:  jsiegle
+    This file is part of the Open Ephys GUI
+    Copyright (C) 2012 Open Ephys
+
+    ------------------------------------------------------------------
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  ==============================================================================
 */
 
 #ifndef __ACCESSCLASS_H_CE1DC2DE__
@@ -23,6 +36,15 @@ class ControlPanel;
 class Configuration;
 class AudioComponent;
 
+
+/**
+  
+  Allows subclasses to access important pointers within the application.
+
+  @see UIComponent
+
+*/
+
 class AccessClass : public ActionBroadcaster
 {
 public:
diff --git a/Source/Processors/AudioNode.cpp b/Source/Processors/AudioNode.cpp
index 2fd02584c716eda9fea663bd64b79b6df933ef59..5ba800e766c419c4d94359f1ede1bdd68ab6d209 100644
--- a/Source/Processors/AudioNode.cpp
+++ b/Source/Processors/AudioNode.cpp
@@ -37,6 +37,8 @@ AudioNode::AudioNode()
 	leftChan.add(0);
 	rightChan.add(1);
 
+	currentChannel = 0;
+
 
 }
 
@@ -70,6 +72,16 @@ void AudioNode::process(AudioSampleBuffer &buffer,
                             int& nSamples)
 {
 
+	// if (currentChannel == 0)
+	// {
+	// 	buffer.clear(1,0,buffer.getNumSamples());
+	// 	buffer.copyFrom();
+	// } else if (currentChannel == 1)
+	// {
+	// 	buffer.clear(0,0,buffer.getNumSamples());
+	// 	buffer.copyFrom();
+	// } else {
+
 	buffer.clear(0,0,buffer.getNumSamples());
 	buffer.clear(1,0,buffer.getNumSamples());
 
@@ -94,4 +106,5 @@ void AudioNode::process(AudioSampleBuffer &buffer,
 					   volume       // gain to apply
 					   );
 	}
+	//}
 }
diff --git a/Source/Processors/EventNode.cpp b/Source/Processors/EventNode.cpp
index 67d365b478703c534219e399d1779bc92b3a2965..e1bba9c700c918db70fc4b9ca937964e22123e52 100644
--- a/Source/Processors/EventNode.cpp
+++ b/Source/Processors/EventNode.cpp
@@ -29,7 +29,6 @@ EventNode::EventNode()
 {
 	setNumOutputs(0);
 	setNumInputs(0);
-//	setSampleRate(44100.0);
 
 	setPlayConfigDetails(getNumInputs(), getNumOutputs(), 44100.0, 128);
 
@@ -46,13 +45,9 @@ AudioProcessorEditor* EventNode::createEditor()
 	setEditor(editor);
 
 	std::cout << "Creating editor." << std::endl;
-	//editor->setUIComponent(getUIComponent());
-	//editor->setConfiguration(config);
 
-	//filterEditor = new FilterEditor(this);
 	return editor;
 
-	//return 0;
 }
 
 
diff --git a/Source/UI/ControlPanel.h b/Source/UI/ControlPanel.h
index e532a258c99082f704ff3149d807ddc1968bb239..72988db998dcd514274a9c77d8e2d3f3af067b61 100644
--- a/Source/UI/ControlPanel.h
+++ b/Source/UI/ControlPanel.h
@@ -33,8 +33,6 @@
 
 #include "../OpenGL.h"
 
-//------------------------------------------------------------------------
-
 /**
   
   Displays information and provides buttons to control acquistion and recording.