diff --git a/TODO b/TODO
index f64f7ce..2a29547 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,23 @@
-- Change default semantics to pick up $USER from the environment and not prompt for it.
-- Add switch to force username prompting
-- When prompting for username, show $USER as default if present.
 - Add ability to auto-upload files w/optional post execution removal
 
+
+Docs
+----
+
+- Username handling
+
+    Change default semantics to pick up $USER from the environment and not prompt for it.
+    Add switch to force username prompting  (-N)
+    When prompting for username, show $USER as default if present.
+
+- Commenting now supported both on -H and in host list files - freeform/block comments
+
+- File Xfer (-G, -P)
+
+   No ~/ interpolation
+   Transfers happen before command execution
+   Any tranfer error on any host aborts program
+   If there's nothing to do, program silently ends
+   Gets done before Puts
+   Gets prepend hostname to saved file
+