diff --git a/BUGS b/BUGS
index 78a5f6020..96e44e88b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,11 +1,23 @@
 Bugs
 ====
 
+- On doodle, when modifying something on http://doodle.com/create and clicking
+  a link to leave the page, the message is suboptimal. Also, with some random
+  clicking it's somehow possible to get out of yesno mode.
+
+- Holding ^ and then @ in command input produces a surprising result on seir's
+  machine on e595e42:
+
+  expected: ^^^^^^^^^^^^^^@@@@@@@@@@@@
+  reality:  ^^^^^^^^^^^^^^@^^^^^^^^^^^
+
 - Because restart is broken, using "restore tabs" in crash dialog doesn't work
   anymore.
 
 - Segfaults when trying to load http://cmpl.cc/downloads/hlwm-tablet.mkv
 
+- Segfaults with youtube HTML5 player
+
 - URL detection and encoded spaces
 
   e.g. when trying to open a link with %20 interactively, or even via click.
diff --git a/TODO b/TODO
index 796783f3b..27f48278e 100644
--- a/TODO
+++ b/TODO
@@ -13,7 +13,6 @@ Before 0.1
 - SSL handling
     - ssl-strict=ask
     - SSL-symbol in statusbar?
-- Downloads (at least calling a handler)
 
 New big features
 ================
@@ -27,7 +26,6 @@ New big features
     NoScript
     Certificate Patrol
     https://chrome.google.com/webstore/detail/remove-google-redirects/ccenmflbeofaceccfhhggbagkblihpoh
-- Downloads
 - session handling / saving
 - multi window (see notes)
 - IPC, like dwb -x (see notes)
@@ -39,9 +37,8 @@ New big features
 Improvements / minor features
 =============================
 
+- Commandline argument to delete config
 - Settings dialog
-- Don't use pkg_resources if unavailable, or detect it on start.
-  Debian: python3-pkg-resources
 - Use argparse and do something like click for command arguments, then we can
   have flags etc.
 - Reimplement tabbar to paint it by ourselves to look like dwb