diff --git a/TODO b/TODO
index 972c80736..61f86822c 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,14 @@
 keyparser foo
 =============
 
-- Handle keybind to get out of insert mode (e.g. esc)
+- Add mode=[]/no_mode=[] to cmdutils.register so we can avoid executing
+  commands in the wrong mode
 - Add more element-selection-detection code (with options?) based on:
       -> javascript: http://stackoverflow.com/a/2848120/2085149
       -> microFocusChanged and check active element via:
          frame = page.currentFrame()
          elem = frame.findFirstElement('*:focus')
+- BUG: sometimes events arrive like 5 times... :(
 
 Bugs
 ====