diff --git a/TODO b/TODO
index a5e53b7d..63826281 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,11 @@
 Hey Emacs, this is -*- outline -*- mode!
 
 * ABI's to break:
-** Currently none.
+** All result returns will be done as structs, not as XML. !!!
+** Make sure that all results can be gotten in asynchronous mode (ie, avoid
+   returning information in the blocking version as function arguments).
+** Drop the support for finding out if an operation is pending.  After all, one
+   or two more ways for a user to shoot themselves in the foot don't matter.
 
 * Thread support:
 ** Build thread modules for static linking (which just suck in the
@@ -9,7 +13,7 @@ Hey Emacs, this is -*- outline -*- mode!
 
 * New features:
 ** notification system
-   We need a simple notification system, probably a a simple callback
+   We need a simple notification system, probably a simple callback
    with a string and some optional arguments.  This is for example
    required to notify an application of a changed smartcard,  The
    application can then do whatever is required.  There are other
@@ -18,6 +22,7 @@ Hey Emacs, this is -*- outline -*- mode!
 ** --learn-code support
    This might be integrated with import. we still need to work out how
    to learn a card when gpg and gpgsm have support for smartcards.
+** set_locale for thread safe and env independent locale selection.
 
 * Documentation
 ** Add note about GPGME clearing out pointer return values.
@@ -31,9 +36,6 @@ Hey Emacs, this is -*- outline -*- mode!
    (it's an internal error, as select_protocol checks already).
 ** When server mode is implemented properly, more care has to be taken to
     release all resources on error (for example to free assuan_cmd).
-** GnuPG
-*** For pipemode, make sure to release the pipemode callback data object.
-    Note, pipemode will eventually be replaced by an Assuan interface to gpg.
 
 * Operations
 ** Passphrase callback should not copy password. !!!
@@ -42,6 +44,9 @@ Hey Emacs, this is -*- outline -*- mode!
 ** Genkey should return something more useful than General_Error.
 ** Factor out common code in _op_*_start functions.
 ** Add ATTR to return the number of subkeys or uids.
+** Optimize the file descriptor list, so the number of open fds is
+   always known easily.  This could replace the pending bit, too,
+   with the exception of keylisting operations maybe.
 
 * Error Values
 ** Map ASSUAN/GpgSM ERR error values in a better way than is done now. !!
@@ -74,7 +79,3 @@ Bugs reported by Stephane Corthesy:
 > the  
 > callback has become invalid; if I use a brand new one, the callback  
 > is called recursively, when I ask to enumerate keys.
-
-
-
-