diff --git a/README b/README
index b79938b5..63d895a2 100644
--- a/README
+++ b/README
@@ -1,24 +1,32 @@
 Qt Cryptographic Architecture (QCA) version 2.0.0
 -------------------------------------------------
-Date: July 5th, 2007
+Date: August 7th, 2007
 Website: http://delta.affinix.com/qca/
 Mailing List: Delta Project <delta@lists.affinix.com>
 
 Project Lead/Maintainer (2003-current):
   Justin Karneges <justin@affinix.com>
+  (March 2007 - July 2007 under Barracuda Networks employment)
 
 Development, Documentation, Unittests (2004-current):
   Brad Hards <bradh@frogmouth.net>
 
 Special Thanks:
+  Portugal Telecom (SAPO division), for sponsorship
   Alon Bar-Lev, for smart card and design assistance
   Jack Lloyd, for Botan and X.509 mentoring
   L. Peter Deutsch, for the public domain MD5 implementation
   Steve Reid, for the public domain SHA1 implementation
+  Jason Kim, for the CMS Signer graphics
 
 
+Install
+-------
   For installation or compiling instructions, see the INSTALL file.
 
+
+License
+-------
   This library is licensed under the Lesser GNU General Public License.  See
   the COPYING file for more information.
 
@@ -56,6 +64,8 @@ Description
   QCA was originally created to support the security needs of the
   Psi XMPP/Jabber client project ( http://psi-im.org/ ).
 
+  API Documentation is located in the 'apidocs' subdirectory.
+
 
 Have fun,
 -Justin
diff --git a/TODO b/TODO
index c593ec61..ddd8d513 100644
--- a/TODO
+++ b/TODO
@@ -1,18 +1,12 @@
 * test1
   doc:
-    documentation overhaul
-    document provider interface
     Change Doxyfile config to capture whole API, and to generate Latex manual
   code:
-    synchronizer: cleanup
-    publickey: cleanup
-    cert: cleanup
-    keystore: cleanup
+    default provider: cleanup
     securelayer: cleanup
-    securemessage: cleanup
-    add logging to qca lib and other plugins
-    add more asserts?
+    add more asserts/logging to qca lib
   other:
+    qca-gnupg: improve gpg detection on mac (check psi 0.10 code)
     finish cmssigner, set to 1.0
     cmssigner: i'm getting a crash sometimes during sign..  test and trace
     update the rootcerts with mozcerts
@@ -38,6 +32,7 @@
   qca-egads (or qca-egd): implement for Random support
 
 * possibilities for the future:
+  publickey: use_asker_fallback should use ErrorPassphrase
   provider: separate public and private keys into two classes to enable
     delegation easier.  the public part should not be implemented by most
     providers.