diff --git a/doc/BUGS b/doc/BUGS
index 2f44ed2b3..1908f7072 100644
--- a/doc/BUGS
+++ b/doc/BUGS
@@ -38,7 +38,7 @@ Input
 - seir sometimes sees "-- COMMAND MODE --" even though that should never
   happen.
 - Shift-Insert in commandline pastes clipboard instead of primary selection
-- Auto-insert-mode sometimes doesn't work correctly
+- Auto-insert-mode sometimes doesn't work correctly (e.g. login form of Gitlab)
 - Sidewise scrolling via mousewheel broken
 
 Rendering
@@ -82,11 +82,9 @@ Misc
 ----
 
 - All kind of FIXMEs
-- --logfilter is broken
 - On doodle, when modifying something on http://doodle.com/create and clicking
   a link to leave the page, with some random clicking it's somehow possible to
-  get out of yesno mode.
-  We also should prevent entering any other mode while in prompt mode.
+  get out of yesno mode. (probably fixed?)
 - Opening via commandline / startpage doesn't work with absolute file paths.
 - Relative file paths and ~ don't work at all.
 - Config errors on start shouldn't be hard errors
@@ -94,7 +92,7 @@ Misc
 - Clicking links/email in crash dialog should open browser/mailclient under
   windows
 - Current font handling is rather broken (rejecting invalid values / setting
-  multiple font families)
+  multiple font families) - we should use PyPEG2 instead.
 
 Tests
 -----
diff --git a/doc/TODO b/doc/TODO
index 5bbb4b002..9d2ca859e 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -19,7 +19,6 @@ Before 0.1
 - Implement some optional stuff from http://greenbytes.de/tech/tc2231/
   (especially filename with Content-Disposition: inline)
 - Icon
-- Use profiler to check what uses most CPU
 
 New big features
 ================
@@ -59,7 +58,7 @@ Improvements / minor features
 - 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?)
-- We should have something like utils.debug.qenum_key for QFlags.
+- Make utils.debug.qenum_key work properly.
 - Honour icognito mode for cookies etc.
 - Make sure commands in config are _complete_
 - Config should check for unknown sections