diff --git a/TODO b/TODO
index e1078d71..dde5b718 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,11 @@ BUGS
 
 - warning when closing new map that was never manually saved
 
+- selecting single line text selects whole line
+
+- clear floor should not remove comments?
+
+
 
 TODO
 ====
@@ -31,9 +36,13 @@ TODO
     - show all notes, or only for the current level
 	- sort by level elevation or note name
 
+  - clipping indicator when nudging / moving
+
   - window handling bugs:
 	  - crash when dragging maximised window
 
+  - add support for wraparound to move & paste preview mode
+
   - OS X:
     - gridmonger document icon
 
diff --git a/extras/docs/fileformat.txt b/extras/docs/fileformat.txt
index fb7b57dc..fbba896a 100644
--- a/extras/docs/fileformat.txt
+++ b/extras/docs/fileformat.txt
@@ -121,12 +121,12 @@ Notes:
           UINT16  index         (max=9999)
           UINT8   indexColor    (max=3)
 
-      if kind == 2 (icon)
-          UINT8   icon          (max=39, see NoteIcons in icons.nim
-                                         for mappings)
-      if kind == 3 (customId)
+      if kind == 2 (customId)
           BSTR    custom ID     (minLen=1, maxLen=2, only alphanumeric)
 
+      if kind == 3 (icon)
+          UINT8   icon          (max=39, see NoteIcons in icons.nim
+                                         for mappings)
       if kind == 4 (label)
           UINT8   labelColor    (max=3)