diff --git a/CHANGES b/CHANGES
index 7af36dfd..c625c968 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 CHANGES FROM 2.5 to master
 
+* Add selection_present format when in copy mode (allows key bindings that do
+  something different if there is a selection).
+
 * Add pane_at_left, pane_at_right, pane_at_top and pane_at_bottom formats.
 
 * Make bell, activity and silence alerting more consistent by: removing the
diff --git a/TODO b/TODO
index 7d1c8471..679d2a56 100644
--- a/TODO
+++ b/TODO
@@ -112,7 +112,17 @@
 
 - hooks
 	* more hooks for various things
-	* finish after hooks for special commands
+	* finish after hooks for special commands. these do not have a hook at
+          the moment:
+		 attach-session detach-client kill-server respawn-window
+		 swap-window break-pane find-window kill-session rotate-window
+		 switch-client choose-tree if-shell kill-window run-shell
+		 wait-for command-prompt join-pane move-window source-file
+		 confirm-before kill-pane respawn-pane swap-pane
+          at the moment AFTERHOOK uses current only if target is not valid,
+          but target is ALWAYS valid - it should use current if no -t flag?
+          then select-* could use AFTERHOOK
 	* multiple hooks with the same name?
 	* finish hooks for notifys
-	* for session_closed, if no sessions at all, perhaps fake up a temporary one
+	* for session_closed, if no sessions at all, perhaps fake up a
+          temporary one