diff --git a/LES-TODOS b/LES-TODOS
index 7f30bd8518..6993ee5ba9 100644
--- a/LES-TODOS
+++ b/LES-TODOS
@@ -24,11 +24,6 @@ MMFiles reference removals from files:
 - StorageEngine specific IndexFactory:
   - create indexes from VPack
   - enhance/validate given VPack index definitions (set default values, reject illegal ones)
-
-in progress
------------
-- move engine-specific parts of transaction.cpp into engine
-- transaction API
 - Implement new IndexIterator API next(callback, limit)
   - Primary
   - Hash
@@ -36,14 +31,13 @@ in progress
   - Persistent
   - Geo
   - Fulltext
-- Implement new IndexIterator API nextExtra(callback, limit)
-  - Primary
-  - Hash
-  - Skiplist
-  - Persistent
-  - Geo
-  - Fulltext
 
+
+
+in progress
+-----------
+- move engine-specific parts of transaction.cpp into engine
+- transaction API
 to do
 -----
 - rename TRI_df_marker_* to something storage-engine specific
@@ -98,6 +92,8 @@ MMFiles are known to the following files:
 
 - IndexFactory needs a function to stringifyIndexes and rename idxFoo => IdxZirkusBar
 
+- Implement new IndexIterator API nextExtra(callback, limit)
+  - Geo
 
 
 
@@ -112,9 +108,8 @@ Questions
 
 OpenIssues Hacki
 ----------------
-* validate geoIndex shortcut. It now sets _done = true earlier => test if break.
 * batchSize == 0 ? What Happens? ASSERT ok? React gracefully?
 * HashIndex Lookup into a still local buffer, could be replaced by callback as well.
-* SingleServerTraverser API does NOT takeover responsibility for slice data. getMore() hapes slices to not go away
+* SingleServerTraverser API does NOT takeover responsibility for slice data. getMore() hopes slices to not go away
   * This API can be improved if we make better use of those callbacks.
 * ShortestPathBlock does assume that slices do not walk away.