diff --git a/FAQ b/FAQ
index 457883b8..2f5f717b 100644
--- a/FAQ
+++ b/FAQ
@@ -12,7 +12,7 @@ tmux offers several advantages over screen:
   whether used interactively, as a key binding, or from the shell;
 - easily scriptable from the shell;
 - multiple paste buffers;
-- emacs key layouts;
+- choice of vim or emacs key layouts;
 - options to limit window size;
 - a cleaner, modern, easily extended, BSD-licensed codebase.
 
diff --git a/TODO b/TODO
index 061f7d59..0116e565 100644
--- a/TODO
+++ b/TODO
@@ -64,3 +64,5 @@
 - document window options changes
 - a window mode to show a clock
 - a key binding to display the status line when it is turned off
+- FAQ "Can I have some examples of cool things I can do with tmux?" -- linkw
+- clone session command