diff --git a/TODO b/TODO
index d642f2e7..8b492cf8 100644
--- a/TODO
+++ b/TODO
@@ -52,6 +52,7 @@
 - document list-commands. document switch-client. document move-window
 - document buffer stuff
 - document next/prev word
+- fix prompt scrolling when line exceeds space **** 
 - commands:
 		save-buffer -b number filename
 		load-buffer -b number filename
@@ -71,3 +72,6 @@
 - command history for command-prompt. better tab completion (use options too)
 - window options should be done similarly to standard options
 - next prev word etc in command prompt
+- split keys in command prompt/scroll mode/copy mode into vi and emacs and
+  have a "edit-mode" option select which keymap
+
diff --git a/tmux.1 b/tmux.1
index 5c156e2b..b56fa480 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.43 2008-06-25 20:33:20 nicm Exp $
+.\" $Id: tmux.1,v 1.44 2008-06-26 19:02:18 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -221,6 +221,10 @@ keys, or
 and
 .Ql l ,
 will scroll left and right.
+.Ql C-u
+and
+.Ql C-f
+may be used to scroll up and down by one screen.
 .It Em copy mode
 This permits a section of a window or its history to be copied to the
 .Em paste buffer