diff --git a/FAQ b/FAQ
index 2f5f717b..3022a8f0 100644
--- a/FAQ
+++ b/FAQ
@@ -13,7 +13,7 @@ tmux offers several advantages over screen:
 - easily scriptable from the shell;
 - multiple paste buffers;
 - choice of vim or emacs key layouts;
-- options to limit window size;
+- an option to limit the window size;
 - a cleaner, modern, easily extended, BSD-licensed codebase.
 
 There are still a few features screen includes that tmux omits:
@@ -22,7 +22,7 @@ There are still a few features screen includes that tmux omits:
   to tmux;
 - a more customisable status line, albeit with an awful syntax;
 - wider platform support, for example IRIX and AIX, and for odd terminals;
-- split windows; this is planned and should appear eventually.
+- split windows; this is planned for tmux and should appear eventually.
 
 * I found a bug! What do I do?
 
diff --git a/TODO b/TODO
index a291de8d..7e875bef 100644
--- a/TODO
+++ b/TODO
@@ -43,7 +43,8 @@
   session not being watched?
 - tidy up window modes
 - problems with force-width when wrapping line in emacs?
-- next prev word etc in command prompt; also ^K
+- next prev word etc in command prompt; also ^K; also make is support modes
+  to support vi. is there something could use for this? editline(3)/readline?
 - many more info() displays for various things
 - vi half page scroll
 - backspace should perhaps wrap backwards over newlines which were not moved