diff --git a/proposal/myrmidon/docs/todo.html b/proposal/myrmidon/docs/todo.html
index de41c2a45..1285b8360 100644
--- a/proposal/myrmidon/docs/todo.html
+++ b/proposal/myrmidon/docs/todo.html
@@ -285,8 +285,6 @@
                         <p>A completely unordered list of items, big and small:</p>
                                 <ul>
                     <li>Search through the code for 'TODO' items and fix them.</li>
-                    <li>Add a custom task to the build to generate antlib descriptors from source.
-                    It would wrap XDoclet, and replace <code>antlib.xml</code>.</li>
                     <li>Tidy-up CLIMain so that it calls System.exit() with a non-zero exit code,
                     if the build fails.</li>
                     <li>Tidy-up the 'build failed' message, so that the stack trace is only
@@ -304,7 +302,10 @@
                     <li>Convert PropertyUtil to a non-static PropertyResolver service.</li>
                     <li>Validate project and target names in DefaultProjectBuilder - reject dodgy
                     names like "," or "", or "  ".  Probably want to exclude names that start or
-                    end with white-space (though internal whitespace is probably fine).</li>
+                    end with white-space (though internal whitespace is probably fine).  We also
+                    want to reserve certain punctuation characters like . , : ? [ ] { }, etc for
+                    future use.</li>
+                    <li>Similarly, validate property names, using the same rules.</li>
                     <li>Detect duplicate type names.</li>
                     <li>Add fully qualified type names, based on antlib name and type shorthand name.
                     Allow these to be used in build files in addition to the shorthand names.</li>
diff --git a/proposal/myrmidon/docs/vfs.html b/proposal/myrmidon/docs/vfs.html
index f2ca67f19..5a3722f02 100644
--- a/proposal/myrmidon/docs/vfs.html
+++ b/proposal/myrmidon/docs/vfs.html
@@ -282,11 +282,11 @@
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
         <td bgcolor="#ffffff"><pre>
 
-                &lt;v-fileset dir=&quot;src&quot;&gt;
-                    &lt;name pattern=&quot;org/apache/tools/ant/**&quot;/&gt;
-                    &lt;is-file/&gt;
-                &lt;/v-fileset&gt;
-                </pre></td>
+&lt;v-fileset dir=&quot;src&quot;&gt;
+    &lt;name pattern=&quot;org/apache/tools/ant/**&quot;/&gt;
+    &lt;is-file/&gt;
+&lt;/v-fileset&gt;
+</pre></td>
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
       </tr>
       <tr>
diff --git a/proposal/myrmidon/src/xdocs/todo.xml b/proposal/myrmidon/src/xdocs/todo.xml
index 9d1cc3845..f6e451ebe 100644
--- a/proposal/myrmidon/src/xdocs/todo.xml
+++ b/proposal/myrmidon/src/xdocs/todo.xml
@@ -185,8 +185,6 @@
 
                 <ul>
                     <li>Search through the code for 'TODO' items and fix them.</li>
-                    <li>Add a custom task to the build to generate antlib descriptors from source.
-                    It would wrap XDoclet, and replace <code>antlib.xml</code>.</li>
                     <li>Tidy-up CLIMain so that it calls System.exit() with a non-zero exit code,
                     if the build fails.</li>
                     <li>Tidy-up the 'build failed' message, so that the stack trace is only
@@ -204,7 +202,10 @@
                     <li>Convert PropertyUtil to a non-static PropertyResolver service.</li>
                     <li>Validate project and target names in DefaultProjectBuilder - reject dodgy
                     names like "," or "", or "  ".  Probably want to exclude names that start or
-                    end with white-space (though internal whitespace is probably fine).</li>
+                    end with white-space (though internal whitespace is probably fine).  We also
+                    want to reserve certain punctuation characters like . , : ? [ ] { }, etc for
+                    future use.</li>
+                    <li>Similarly, validate property names, using the same rules.</li>
                     <li>Detect duplicate type names.</li>
                     <li>Add fully qualified type names, based on antlib name and type shorthand name.
                     Allow these to be used in build files in addition to the shorthand names.</li>
diff --git a/proposal/myrmidon/src/xdocs/vfs.xml b/proposal/myrmidon/src/xdocs/vfs.xml
index e1820af7f..4704ed118 100644
--- a/proposal/myrmidon/src/xdocs/vfs.xml
+++ b/proposal/myrmidon/src/xdocs/vfs.xml
@@ -103,11 +103,11 @@
 
                 <source><![CDATA[
 
-                <v-fileset dir="src">
-                    <name pattern="org/apache/tools/ant/**"/>
-                    <is-file/>
-                </v-fileset>
-                ]]></source>
+<v-fileset dir="src">
+    <name pattern="org/apache/tools/ant/**"/>
+    <is-file/>
+</v-fileset>
+]]></source>
 
                 <h3><code>&lt;flat-fileset&gt;</code></h3>