diff --git a/src/commandViews.js b/src/commandViews.js
index d4e7fb93..e22328e9 100644
--- a/src/commandViews.js
+++ b/src/commandViews.js
@@ -8,7 +8,7 @@ var CommandPromptView = Backbone.View.extend({
     this.commandCursor = this.$('#prompt span.cursor')[0];
 
     // this is evil, but we will refer to HTML outside the document
-    // and attach a click event listener
+    // and attach a click event listener so we can focus / unfocus
     $(document).delegate('#commandLineHistory', 'click', _.bind(function() {
       this.focus();
     }, this));
@@ -18,7 +18,7 @@ var CommandPromptView = Backbone.View.extend({
       this.blur();
     }, this));
 
-    // hacky timeout focus
+    // hacky timeout focus TODO
     setTimeout(_.bind(function() {
       this.focus();
     }, this), 100);
diff --git a/src/git.js b/src/git.js
index 998042e3..b4050c3d 100644
--- a/src/git.js
+++ b/src/git.js
@@ -418,7 +418,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
     return commit;
   }
 
-  var pQueue = [].concat(commit.get('parents'));
+  var pQueue = [].concat(commit.get('parents') || []);
   pQueue.sort(this.idSortFunc);
   numBack--;
 
diff --git a/todo.txt b/todo.txt
index 2c9c187a..eb001aca 100644
--- a/todo.txt
+++ b/todo.txt
@@ -13,6 +13,16 @@ ALSO other big things:
 
 - sizing on visedge arrowheads, also fill most likely
 
+Big Graphic things:
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+- colored branch edges. basically 
+- node rings, really think we should do it
+
+
+Medium things:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Rebuilding trees from a JSON snapshot / blob. this should be easy... i think. if we remove the need for parents
+
 
 Small things to implement:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -26,3 +36,10 @@ Bugs to fix:
 - When you are rebasing and you hit the bottom, all the nodes go in the wrong spot...
           We need some kind of "update everything but this set of nodes" thing...
 
+- cannot checkout commits with dashes
+
+- when generating new ids (C1' or C2''), need to check if they already exist!!! otherwise it wil barf
+- always grab the maxHeight
+- debug why typing takes so long with the profiler
+
+