diff --git a/TODO.txt b/TODO.txt
index f6e11b9d75621e1bcfc0e9d519536ffb5faf0720_VE9ETy50eHQ=..4b1fa3d0fa8b915a7581e9b04eb864a4a1796222_VE9ETy50eHQ= 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,6 +1,5 @@
 GENERAL
 ==========
-* explicit file renames
 * integrate as native protocol handler (hg push git://...)
 * more tests
 * submodules?
@@ -12,10 +11,9 @@
 * push with branch names (w/ proper error messages)
 * explain what branch mapping policy determined when updating refs
 * convert tags to git
-* octopus merge explode re-implode
 
 FETCH
 ===========
 * gfetch command
 * only try to import non-mapped commits
 * tag conversion
@@ -16,13 +14,22 @@
 
 FETCH
 ===========
 * gfetch command
 * only try to import non-mapped commits
 * tag conversion
-* save git metadata (committers, unless it's the same) as extra info
-* octopus merge explode
+
+MAPPING ISSUES
+==============
+Created in Hg:
+* explicit file renames
+* named branches
+
+Created in Git:
+* octopus merge explode/implode
+* different committer in Git objects
+
 
 SPEED/EFFICIENCY
 ================
 * switch object mapping to hg->git since the many to one is that direction
 * don't send blobs/trees already on server
@@ -24,13 +31,6 @@
 
 SPEED/EFFICIENCY
 ================
 * switch object mapping to hg->git since the many to one is that direction
 * don't send blobs/trees already on server
-
-MILESTONES
-=============
-* Hg<->Git<->Hg
-  - create a repo in Hg
-  - push to a Git server
-  - clone into another Hg client
-  - verify that the node ids are identical
+* packfile creation benchmarking (seems to take a while sometimes)
\ No newline at end of file