diff --git a/BUGS b/BUGS
index f1f54a45e..a8c7796e6 100644
--- a/BUGS
+++ b/BUGS
@@ -4,6 +4,12 @@ Bugs
 - 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
+
+- URL detection and encoded spaces
+
+  e.g. when trying to open a link with %20 interactively, or even via click.
+
 - When following a hint:
 
   QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once.
diff --git a/TODO b/TODO
index b9ce538d8..ffc37f8b6 100644
--- a/TODO
+++ b/TODO
@@ -39,6 +39,8 @@ New big features
 Improvements / minor features
 =============================
 
+- 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
 - Save cookies in Netscape format so it can be used by wget. (see notes)
 - Zoom with ctrl + mousewheel