diff --git a/TODO b/TODO
index 22c323ba76967801f8e3fb6e6d7f69d8ce3a4074..78f77d306f245f61bb4827c80666398c805107c0 100644
--- a/TODO
+++ b/TODO
@@ -1,34 +1,23 @@
 ------------------------------------------------------------
 -= 1.0 =-
 
-* add withGreencard=
-
-* Fix up sdist? hide sdist? bdist?
-** if there's a flag, --include-preprocessed-sources (or something
-   better) run the preprocessing phase and include both the
-   unpreprocessed and the preprocessed sources in the source tarball?
-** Better way to find 'tar'; is there a library? what does darcs do?
-
 * Write semantic checker for package description file.  start w/
    sanity checker.  give error if buildInfo field given when no
-   exposed or hidden modules for a library.
+   exposed or hidden modules for a library.  Check for required
+   fields.
 
 * Decide on interface
-** Which fields are required
+** Which fields are required, which targets required.
 ** which Distribution.* things won't change?
+** document
 
-* un/registering the package on the target
-** dump shell scripts for registering and unregistering?
-** dry run, just to dump the .installed-pkg-config?
-
-** think about HC-PKG's role here. maybe HC-PKG should do all this instead
+* add withGreencard=
 
-** Should "setup install" copy Setup.lhs, Setup.description, and
-   local-build-info into a common location for the sake of unregister?
-   Will we have to make this a requirement of 'install'? (suggested by
-   kosmikus) Would it be better for HC-PKG to have the unregister
-   command?
-** Add a flag to configure to specify where to put them?
+* Fix up sdist? hide sdist? bdist?
+** if there's a flag, --include-preprocessed-sources (or something
+   better) run the preprocessing phase and include both the
+   unpreprocessed and the preprocessed sources in the source tarball?
+** Better way to find 'tar'; is there a library? what does darcs do?
 
 * do we have to run configure before clean?
 
@@ -55,10 +44,6 @@
 
 * grep for "FIX"
 
-* Compatibility
-** verify windows test suite
-** verify ghc6.4 test suite
-
 * Parsing
 ** Allow quoting in the options fields, to allow things like
   -f"something with spaces"