diff --git a/Makefile.in b/Makefile.in
index f5eb95f..f7118e9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,7 +77,9 @@ INSTALL_SCRIPT	=	$(INSTALL) -m 755
 # Targets...
 #
 
-DOCFILES	=	doc/mxml.html doc/mxmldoc.xsd \
+DOCFILES	=	doc/0.gif doc/1.gif doc/2.gif doc/3.gif doc/4.gif \
+			doc/A.gif doc/B.gif doc/C.gif doc/D.gif \
+			doc/mxml.html doc/mxmldoc.xsd \
 			README COPYING CHANGES
 PUBLIBOBJS	=	mxml-attr.o mxml-entity.o mxml-file.o mxml-index.o \
 			mxml-node.o mxml-search.o mxml-set.o
diff --git a/doc/reference.html b/doc/reference.html
index d90019d..152e88e 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -1390,7 +1390,7 @@ mxmlWalkPrev(
 <!-- NEW PAGE -->
 <h3 class='title'><a name='mxml_attr_s'>mxml_attr_s</a></h3>
 <h4>Description</h4>
-<p>Data types...
+<p>An XML element attribute value.
 <h4>Definition</h4>
 <p><tt>
 struct mxml_attr_s<br>
@@ -1562,7 +1562,7 @@ struct mxml_text_s<br>
 <!-- NEW PAGE -->
 <h3 class='title'><a name='mxml_attr_t'>mxml_attr_t</a></h3>
 <h4>Description</h4>
-<p>Data types...
+<p>An XML element attribute value.
 <h4>Definition</h4>
 <p><tt>
 typedef struct <a href='#mxml_attr_s'>mxml_attr_s</a> mxml_attr_t;
diff --git a/mxml.xml b/mxml.xml
index ac2560a..a5a78ed 100644
--- a/mxml.xml
+++ b/mxml.xml
@@ -1067,7 +1067,7 @@ the walk to the node's children.</description>
     </argument>
   </function>
   <struct name="mxml_attr_s">
-    <description>Data types...</description>
+    <description>An XML element attribute value.</description>
     <variable name="name">
       <type>char *</type>
       <description>Attribute name</description>
@@ -1079,7 +1079,7 @@ the walk to the node's children.</description>
   </struct>
   <typedef name="mxml_attr_t">
     <type>struct mxml_attr_s</type>
-    <description>Data types...</description>
+    <description>An XML element attribute value.</description>
   </typedef>
   <typedef name="mxml_custom_destroy_cb_t">
     <type>void(*)(void *)</type>
@@ -1130,7 +1130,6 @@ the walk to the node's children.</description>
   <typedef name="mxml_error_cb_t">
     <type>void(*)(const char *)</type>
     <description>Error callback function</description>
-    <description>An XML element attribute value.</description>
   </typedef>
   <struct name="mxml_index_s">
     <description>An XML node index.</description>
@@ -1213,8 +1212,6 @@ the walk to the node's children.</description>
   <typedef name="mxml_sax_cb_t">
     <type>void(*)(mxml_node_t *, mxml_sax_event_t, void *)</type>
     <description>SAX callback function</description>
-    <description>C++ support...</description>
-    <description>End of &quot;$Id$&quot;.</description>
   </typedef>
   <enumeration name="mxml_sax_event_e">
     <description>SAX event type.</description>
diff --git a/mxmldoc.c b/mxmldoc.c
index 0c28888..5e8ebc7 100644
--- a/mxmldoc.c
+++ b/mxmldoc.c
@@ -1425,7 +1425,7 @@ scan_file(const char  *filename,	/* I - Filename */
 			        	 mxmlNewText(description, 0, buffer));
 			}
 
-//			typedefnode = NULL;
+			typedefnode = NULL;
 		      }
 		      else if (strcmp(tree->value.element.name, "mxmldoc") &&
 		               !mxmlFindElement(tree, tree, "description",
@@ -1545,7 +1545,7 @@ scan_file(const char  *filename,	/* I - Filename */
 			             mxmlNewText(description, 0, buffer));
 		    }
 
-//		    typedefnode = NULL;
+		    typedefnode = NULL;
 		  }
 		  else if (strcmp(tree->value.element.name, "mxmldoc") &&
 		           !mxmlFindElement(tree, tree, "description",