diff --git a/NOTES b/NOTES
index 0abf702d..0be8954a 100644
--- a/NOTES
+++ b/NOTES
@@ -8,9 +8,7 @@ Key bindings:
     n next window
     p previous window
     l last (next to last selected) window
-    r refresh screen
-    w list current windows
-    i show window info
+    ? list current key bindings
     0-9 select window
 
 There is one default server process per user which puts its socket in
@@ -18,35 +16,46 @@ There is one default server process per user which puts its socket in
 invocations will connect to the same server. The server holds multiple
 sessions.
 
-Syntax is: tmux [-v] [-S path] command [flags]
+Syntax is: tmux [-v] [-S path] [-s sessioon] command [flags]
 
     -v Create logfiles, verbosity increases with more -v
     -S Set different server socket path
-
-Commands:
-    (Commands can be shortened, as long as they are unambiguous)
-
-    new-session [-s <session name>] [-d]
-        Create new session. Attaches to new session unless -d is given.
-
-    attach [-s <session name>] 
-        Attach to session.
-
-    list-sessions
-        List sessions (can be shortened to ls).
-
-    list-windows [-s <session name>]
-        List windows (can be shortened to lsw).
-
-    rename-window [-s <session name>] [-i <window index>] name
-        Rename window.
+    -s Specify session name for command, if appropriate.
 
 If a session name is not given, the current session is assumed if a command
 is run from inside tmux and the TMUX environment variable is available,
 otherwise if only one exists, it is used or if multiple exist, an error is
 generated.
 
-Sessions are destroyed when no windows remain attached to them.
+Commands:
+    (Commands can be shortened, as long as they are unambiguous)
 
-You might get message "couldn't find server" after a crash, in this case you
-must remove the /tmp/tmux-`id -u` file manually.
+    new-session [-d] [-s session name] [-n window name] [command]
+        Create new session. Attaches to new session unless -d is given.
+
+    attach-session [-d]
+        Attach to session. Detaches other clients if -d is given.
+
+    list-sessions
+        List sessions (can be shortened to ls).
+
+    list-windows
+        List windows (can be shortened to lsw).
+
+    rename-window [-i <window index>] new name
+        Rename window.
+
+    bind-key key command
+	Bind a key to a command (use ^A for ctrl-A), commands are as listed
+        above.
+
+    list-keys
+	List current key bindings.
+
+    unbind-key key
+	Unbind a key from a command.
+
+    set-option prefix key
+	Set command prefix (meta) key.
+
+Sessions are destroyed when no windows remain attached to them.