diff --git a/bin/yuidoc_parse.py b/bin/yuidoc_parse.py
index 226085e2..919e69f8 100755
--- a/bin/yuidoc_parse.py
+++ b/bin/yuidoc_parse.py
@@ -563,7 +563,10 @@ def parseModule(tokenMap):
                 target, tokenMap = parseModule(tokenMap)
             
             if self.subModName:
+                # provides a place to link to on the module landing page
                 self.data[MODULES][self.currentModule][SUBDATA][self.subModName][NAME] = longName
+
+                # this was overwriting the submodule description
                 # if DESCRIPTION in tokenMap:
                 #     d = tokenMap[DESCRIPTION][0]
                 #     try: 
diff --git a/template/main.tmpl b/template/main.tmpl
index c630861e..e6c5dc04 100644
--- a/template/main.tmpl
+++ b/template/main.tmpl
@@ -559,7 +559,11 @@
                                         <h4>Submodules:</h4> 
                                         <dl>
                                         #for $info in $submodules
+                                            #if $subdata[$info].name
                                             <dt><code><a href="${$subdata[$info].name}.html" title="$info">$info</a></code></dt>
+                                            #else
+                                            <dt><code>$info</code></dt>
+                                            #end if
                                             <dd>$subdata[$info].description</dd>
                                         #end for
                                         </dl>
diff --git a/test/event.sh b/test/event.sh
index 48cafe4f..9757b95e 100755
--- a/test/event.sh
+++ b/test/event.sh
@@ -9,7 +9,7 @@ yuidoc_home=..
 
 src=~/src/yui3/src
 
-parser_in="$src/yui/js $src/event-custom/js $src/event/js $src/dump/js $src/substitute/js"
+parser_in="$src/yui/js $src/event-custom/js $src/event/js $src/dump/js $src/substitute/js $src/anim/js $src/collection/js"
  
 # The location to output the parser data.  This output is a file containing a 
 # json string, and copies of the parsed files.