diff --git a/TODO b/TODO
index cff9719..d916d31 100644
--- a/TODO
+++ b/TODO
@@ -1,24 +1,5 @@
-- The HOSTNAME and HOSTSHORT built-in names no longer use < and > as
-  delimiters, but use a double underbar instead as in: __HOSTNAME__.
-  This change was made to avoid having to quote these metacharcters
-  since they are used by the shell for redirection.
-
-- Fixed bug that prevented the proper dereferencing of HOSTNAME
-  in certain file transfer specifications.
-
-- Fixed bug that only recognized sudo invocations if they were the
-  first statement on a command line.  All instances of the string
-  "sudo " will now force sudo password prompting and processing.
-  That string is ignored if it appears inside single- or double quotes.
-  
-- Added -l logging option. Defaults to /dev/null.  This fixes the error
-  that was previously being reported:
-
-    "No handlers could be found for logger "paramiko.transport"
-
-- Suppressed ssh-agent use and search for keys when doing password auth.
-
-- Changed hostname separator from ':' to '-' when using the -G command.
+NEW
+---
 
 - Added -E to redirect all stderr output to stdout instead,
 
@@ -26,11 +7,45 @@
 
 - Added -a to allow program to continue after file transfer error.
 
-- Fixed error reporting blowout when key-exchange auth fails.
+- Added -l logging option. Defaults to /dev/null.  This fixes the error
+  that was previously being reported:
+
+    "No handlers could be found for logger "paramiko.transport"
+
+
+CHANGES
+-------
+
+- Changed hostname separator from ':' to '-' when using the -G command.
+
+- The HOSTNAME and HOSTSHORT built-in names no longer use < and > as
+  delimiters, but use a double underbar instead as in: __HOSTNAME__.
+  This change was made to avoid having to quote these metacharacters
+  since they are used by the shell for redirection.
 
 - Error messages now more consistent and clear.
 
 
+BUG FIXES
+---------
+
+- Fixed bug that prevented the proper dereferencing of HOSTNAME
+  in file transfer specifications.
+
+- Fixed bug that prevented '.define' variables from being substituted
+  in file transfer specifications.
+
+- Fixed bug that only recognized sudo invocations if they were the
+  first statement on a command line.  All instances of the string
+  "sudo " will now force sudo password prompting and processing.
+  That string is ignored if it appears inside single- or double quotes.
+  
+- Fixed bug that intermittently occurred during password-based auth
+  sessions because ssh-agent and key searching were still being used.
+
+- Fixed error reporting blowout when key-exchange auth fails.
+
+
 TODO
 ----