diff --git a/TODO.txt b/TODO.txt
index 4d2cc26a6e51279c32beb684c1f259900cdbc08f_VE9ETy50eHQ=..0a3c7f1fa06ad696bd29c0207320d5b58c2d8738_VE9ETy50eHQ= 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,11 +4,8 @@
   - hg push git@...
   - hg fetch [remote] (remote is url, hg alias or hg-git remote)
   - hg clone url
-* fail nicely when the remote_name is not there
-* submodules?
-* .gitignore, etc - try to convert? 
-  - (probably not automatically, but perhaps a generator?)
+
 
 MAPPING ISSUES
 ==============
 * octopus merge explode/implode
@@ -11,6 +8,5 @@
 
 MAPPING ISSUES
 ==============
 * octopus merge explode/implode
-
 * work in Git on a named branch created in Hg is forward-ported to be named branch commits in Hg and stripped back out if re-exported
@@ -16,4 +12,3 @@
 * work in Git on a named branch created in Hg is forward-ported to be named branch commits in Hg and stripped back out if re-exported
-
 * timezone issues (?)
 
@@ -18,6 +13,7 @@
 * timezone issues (?)
 
-PUSH
-==========
+
+REMOTE/BRANCH STUFF
+=====================
 * push with branch names (w/ proper error messages)
 * explain what branch mapping policy determined when updating refs
@@ -22,4 +18,5 @@
 * push with branch names (w/ proper error messages)
 * explain what branch mapping policy determined when updating refs
+
 * add a warning for a non-fast forward push
 * error nicer if pushing to remote without push access (over git://)
@@ -24,5 +21,7 @@
 * add a warning for a non-fast forward push
 * error nicer if pushing to remote without push access (over git://)
+* fail nicely when the remote_name is not there
+
 
 WEBSITE
 ===========
@@ -30,9 +29,10 @@
 * screencast
 * git+ssh, git@ descriptions, better error detection for that
 
+
 SPEED/EFFICIENCY
 ================
 * switch object mapping to hg->git since the many to one is that direction
 * don't send blobs/trees already on server (thin pack)
 * packfile creation benchmarking (seems to take a while sometimes)
   - at least provide status output
@@ -33,6 +33,13 @@
 SPEED/EFFICIENCY
 ================
 * switch object mapping to hg->git since the many to one is that direction
 * don't send blobs/trees already on server (thin pack)
 * packfile creation benchmarking (seems to take a while sometimes)
   - at least provide status output
+
+
+MAYBE
+==========
+* submodules?
+* .gitignore, etc - try to convert? 
+  - (probably not automatically, but perhaps a generator?)