diff --git a/TODO b/TODO
index 40f6c831..325f7b24 100644
--- a/TODO
+++ b/TODO
@@ -94,3 +94,6 @@
 - better support for stupid margin terminals. strcmp for cons25 sucks, how can
   these be autodetected?
 - the escape timer for M- is too short for escape+key. fiddle with it
+- page up/down in choose mode is STILL broken. damn
+- set-option should be set-session-option and should be overall global options
+  for stuff like mode keys?