diff --git a/doc/BUGS b/doc/BUGS
index b7075d2c1..66693ef72 100644
--- a/doc/BUGS
+++ b/doc/BUGS
@@ -35,6 +35,8 @@ Webview
 Input
 -----
 
+- going to passthrough mode (Ctrl-V) then clicking element to go to insert
+  mode, then leaving insert mode clears statusbar text.
 - seir sometimes sees "-- COMMAND MODE --" even though that should never
   happen.
 - Shift-Insert in commandline pastes clipboard instead of primary selection
diff --git a/doc/TODO b/doc/TODO
index 30e3c569b..a0a25b355 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -54,6 +54,13 @@ Downloads
 Improvements / minor features
 =============================
 
+- Command/page to show all keybindings?
+- File moves:
+    - state should be in data, not config
+    - data/cache should be in subdirs on Windows if everything is in the same
+      dir.
+- view_source using pygments
+- check what exceptions open() calls could possibly throw
 - Improve -m error message when we're inside the qutebrowser dir (maybe use a
   Tk gui?)
 - Sane default for editor (maybe via QDesktopServices or so?)