diff --git a/TODO.txt b/TODO.txt
index 6b0ba74..ff3b239 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -23,18 +23,15 @@ Stuff:
 - Reduce malloc() pressure all over the place. We fragment memory like mad.
 - macclassic.c :
   "/* (Hmm. Default behaviour is broken in the base library.  :)  )  */"
-- Platforms to port to: Amiga (needs platform driver), DOS4GW (platform driver).
 - profile string list interpolation.
 - We have two different ways to find dir entries in zip.c.
 - Do symlinks in zip archiver work when they point to dirs?
 - Enable more warnings?
 - Use __cdecl in physfs.h?
 - Look for FIXMEs (many marked with "!!!" in comments).
-- Probably other stuff. Requests and recommendations are welcome.
 - Cygwin should use unix/posix and not win32 platform code.
 - Expose the archiver registration mechanism to the outside world.
 - Find some way to relax or remove the security model for external tools.
-- Non-blocking I/O
 - mmap() in posix.c
 - OSX shouldn't use ~/.app for userdir.
 - fscanf and fprintf support in extras dir.
@@ -42,7 +39,7 @@ Stuff:
 - Sanity check byte order at runtime.
 - Memory locking?
 - Find a better name than dvoid and fvoid.
-- Can win32.c and pocketpc.c get merged?
+- Can windows.c and pocketpc.c get merged?
 - There's so much cut-and-paste between archivers...can this be reduced?
 - General code audit.
 - Multiple write dirs with mount points?
@@ -50,13 +47,12 @@ Stuff:
 - Why is physfsrwops.c cut-and-pasted into the ruby bindings?
 - Replace code from SDL...
 - Should file enumeration return an error or set error state?
-- Update internal zlib?
 - Need "getmountpoint" command in test_physfs.c ...
 - Look for calloc() calls that aren't going through the allocation hooks.
 - maybe other stuff.
-- Is -Wall enabled?
 - Make mutexes recursive, so callbacks can call into the API.
 - Archivers need abstracted i/o to read from memory or files (archives in archives?)
+- Probably other stuff. Requests and recommendations are welcome.
 
 // end of TODO.txt ...