diff --git a/src/Commands/CommandManager.h b/src/Commands/CommandManager.h
index fe2f2a1..7a22d21 100644
--- a/src/Commands/CommandManager.h
+++ b/src/Commands/CommandManager.h
@@ -1,6 +1,3 @@
-// CommandManager class to keep a stack of commands for undo functionality
-// Created by Krisjanis Rijnieks 2015-03-24
-
 #pragma once
 
 #import <deque>
@@ -14,9 +11,12 @@ namespace ofx{
             public:
                 void executeCommand(BaseCommand * cmd);
                 void undo();
+                // TODO: Add redo
             
             private:
                 std::deque<BaseUndoableCommand *> commandStack;
+                // TODO: Add redo stack
+                //       Maybe use vector instead of deque...
         };
         
     } // namespace piMapper
diff --git a/src/MediaServer/MediaServer.h b/src/MediaServer/MediaServer.h
index f49f0ea..9777818 100644
--- a/src/MediaServer/MediaServer.h
+++ b/src/MediaServer/MediaServer.h
@@ -13,6 +13,10 @@
 
 #include "ofMain.h"
 #include "DirectoryWatcher.h"
+
+/* Discussion: This could be the right place for a Factory Method or
+ * Abstract Factory design pattern - replace all these includes with a
+ * SourceFactory that can create sources with the interfaces below. */
 #include "BaseSource.h"
 #include "ImageSource.h"
 #include "VideoSource.h"
diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h
index d0e40c7..5ff4057 100644
--- a/src/ofxPiMapper.h
+++ b/src/ofxPiMapper.h
@@ -1,12 +1,5 @@
-/* ofxPiMapper
- *
- * Description: 
- * Main ofxPiMapper class. Holds instances of all necessary parts of the tool:
- *  - MediaServer
- *  - SurfaceManager
- *  - SurfaceManagerGui (this asks for a different architecture)
- *
- * Author: Krisjanis Rijnieks */
+// ofxPiMapper
+// Author: Krisjanis Rijnieks
 
 // On using prefixes like m or p (mMemberVariable, pMyPointer)
 // http://stackoverflow.com/questions/1228161/why-use-prefixes-on-member-variables-in-c-classes