diff --git a/TODO b/TODO
index c98b56ca..5fd4eca6 100644
--- a/TODO
+++ b/TODO
@@ -30,17 +30,15 @@ Unify VMS->find_perl
 
 Consider if VMS->find_perl needs to have pieces put into maybe_command()
 
-Consider if shell escaping all macro data is a good idea.
-
-Move Win32->init_others() ExtUtils::Command overrides into MM_Any.
+Add a MM_Any->init_others() using ExtUtils::Command.
 
 Figure out and document the 4th arg to ExtUtils::Install::install()
 
 Consider if adding a nativize() routine to replace macify() and
 fixpath() is useful.
 
-Eliminate the above from inside FS::VMS->catfile and catdir.  Make into 
-MM_VMS wrappers.
+Eliminate eliminate_macros() from inside FS::VMS->catfile and catdir.
+Make into MM_VMS wrappers.
 
 Add "NO_META" to stop autogeneration (and auto overwrite) of META.yml.
 
@@ -48,4 +46,14 @@ Test ExtUtils::Command::MM
 
 Finish ExtUtils::MakeMaker::Tutorial
 
+Add 'how to install additional files' to ExtUtils::MakeMaker::FAQ.
+
 Fix NORECUSE bug continuing to set DIR
+
+Make 00compile.t test work off MANIFEST
+
+Give typemap location its own macro.
+
+Only look for typemaps in the core library.
+
+Fix ExtUtils::Installed on VMS.