diff --git a/README b/README
index 21b147e5ae57f87f3c8e4dc3dbadde392dec12bf..5dc3a440ced15e9c22d29cf19ae62ba23456ded6 100644
--- a/README
+++ b/README
@@ -13,6 +13,8 @@ me if you have any questions/bugs found/features/ideas/comments etc :)
 Matt Johnston
 matt@ucc.asn.au
 
+
+In the absence of detailed documentation, some notes follow:
 ============================================================================
 
 Public key auth:
@@ -28,6 +30,13 @@ user.
 NOTE: Dropbear ignores authorized_keys options such as those described in the
 OpenSSH sshd manpage, and will not allow a login for these keys. 
 
+============================================================================
+
+If you want to get the public-key portion of a Dropbear private key, look at
+dropbearkey's '-y' option.
+
+============================================================================
+
 To run the server, you need to generate server keys, this is one-off:
 ./dropbearkey -t rsa -f dropbear_rsa_host_key
 ./dropbearkey -t dss -f dropbear_dss_host_key
@@ -35,18 +44,16 @@ To run the server, you need to generate server keys, this is one-off:
 or alternatively convert OpenSSH keys to Dropbear:
 ./dropbearconvert openssh dropbear /etc/ssh/ssh_host_dsa_key dropbear_dss_host_key
 
-And you can now run the server.
-./dropbear
-
-or './dropbear -h' to get options.
+============================================================================
 
 If the server is run as non-root, you most likely won't be able to allocate a
 pty, and you cannot login as any user other than that running the daemon
 (obviously). Shadow passwords will also be unusable as non-root.
 
+============================================================================
+
 The Dropbear distribution includes a standalone version of OpenSSH's scp
 program. You can compile it with "make scp", you may want to change the path
 of the ssh binary, specified near the top of the scp.c file. By default
-the progress meter isn't compiled in to save space, you can enable it with
-"make scp-progress".
-
+the progress meter isn't compiled in to save space, you can enable it by 
+adding 'SCPPROGRESS=1' to the make commandline.
diff --git a/TODO b/TODO
index 4197284ab170d89886a13b8bce0721f12e2e8b28..5e67b1855bc0da9949c1563540b840a7034a3e64 100644
--- a/TODO
+++ b/TODO
@@ -23,3 +23,7 @@ Things which might need doing:
 - Use m_burn for clearing sensitive items in LTM/LTC
 
 - fix scp.c for IRIX
+
+- Be able to use OpenSSH keys for the client? or at least have some form of 
+  encrypted keys.
+- Client agent forwarding
diff --git a/debug.h b/debug.h
index d619a58e5729b811582616337325d2b9561a13e9..3ae7ca56d02213dc9b1dbc1930ebc99066def44e 100644
--- a/debug.h
+++ b/debug.h
@@ -36,7 +36,7 @@
 /* Define this to print trace statements - very verbose */
 /* Caution: Don't use this in an unfriendly environment (ie unfirewalled),
  * since the printing does not sanitise strings etc */
-#define DEBUG_TRACE
+/* #define DEBUG_TRACE */
 
 /* All functions writing to the cleartext payload buffer call
  * CHECKCLEARTOWRITE() before writing. This is only really useful if you're