--- a/xml/prov-xml.html	Mon Mar 04 23:18:41 2013 -0700
+++ b/xml/prov-xml.html	Tue Mar 05 00:18:56 2013 -0700
@@ -68,26 +68,43 @@
 
     $(function() {
     	$("pre.schema-type").before("<p>Type definition in XML Schema:</p>");
+
 	    	    
 	    $("pre.schema-element").each(function(index) {
 		    $(this)
 		    	.before("<p>The element <code>"+$(this).attr("element")+"</code> is used to reference a "+$(this).attr("schemaType")+" from within a prov:Document or prov:BundleConstructor.</p>")
 		    	.before("<p>Element definition in XML Schema:</p>")
+		    	.removeAttr("schemaType")
+		    	.removeAttr("element")
 	    });
 	    
 	    $("pre.prov-attribute").each(function(index) {
 		    $(this)
 		    	.before("<p>The element <code>"+$(this).attr("element")+"</code> is used to represent a PROV "+$(this).attr("provType")+" attribute and has type "+$(this).attr("schemaType")+".</p>")
 		    	.before("<p>Element definition in XML Schema:</p>")
+		    	.removeAttr("provType")
+		    	.removeAttr("schemaType")
+		    	.removeAttr("element")
+	    });
+	    
+	    $("pre.schema-attribute").each(function(index) {
+	    	$(this)
+	    		.removeAttr("attribute")
+	    		.removeAttr("schemaType")
+	    });
+	    
+	    $("pre[ignore]").each(function(index) {
+	    	$(this)
+	    		.removeAttr("ignore")
 	    });
 	    
 	    $("pre.example[title]:not([:ignore])").each(function() {
 		    $(this)
-		    	.before("<p>The following is an example of using <code>"+$(this).attr("title")+"</code> in PROV-XML.</p>");
+		    	.before("<p>The following is an example of using <code>"+$(this).attr("title")+"</code> in PROV-XML.</p>")
 	    });
-	    
+	  
+	  });
     });
-      });
     </script>
 
     <script class="remove"> 
@@ -481,7 +498,7 @@
 </div>
 
 <div style="text-align: center;">
-<span class="figure" id="fig-figure-1-prov-dm-components-informative" style="max-width: 95%; ">
+<figure id="fig-figure-1-prov-dm-components-informative" style="max-width: 95%; ">
 <img usemap="#componentMap" src="images/dm/components-dependencies.png" alt="PROV-DM Components" style="max-width: 90%; ">
 <map id="componentMap" name="componentMap">
 <area title="agents/responsibility" href="#component3" coords="0,0,67,268" alt="agents/responsibility" shape="rect"/>
@@ -495,15 +512,15 @@
 <area title="bundles" href="#component4" coords="268,0,402,201" alt="bundles" shape="rect"/>
 </map>
 <br>
-<span class="figcaption" id="prov-dm-components">Figure 1<sup><a class="internalDFN" href="#prov-dm-components"><span class="diamond"> ◊:</span></a></sup> PROV-DM Components (Informative)</span>
-</span>
+<figcaption id="prov-dm-components"><!-- Figure 1<sup><a class="internalDFN" href="#prov-dm-components"><span class="diamond"> ◊:</span></a></sup>--> PROV-DM Components (Informative)</figcaption>
+<figure>
 </div>
 
 <p><a href="#prov-schema-mapping">Table 1</a> is a mapping of PROV-DM types and relations in PROV-XML schema XML types and elements.</p>
 
 <div id="prov-schema-mapping-div" style="text-align: center;">
 <table  class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-schema-mapping"><span>Table 1<sup><a class="internalDFN" href="#prov-schema-mapping"><span class="diamond"> ◊:</span></a></sup> </span>PROV-DM Types and Relations to XML Schema Mapping</caption> 
+<caption id="prov-schema-mapping"><!--<span>Table 1<sup><a class="internalDFN" href="#prov-schema-mapping"><span class="diamond"> ◊:</span></a></sup> </span>-->PROV-DM Types and Relations to XML Schema Mapping</caption> 
 <tr>
 <td><a><b>Type or Relation Name</b></a></td>
 <td><b>XML Schema ComplexType</b></td>
@@ -2280,14 +2297,12 @@
 	<dt>Fragment identifier considerations:</dt>
 	<dd>N/A</dd>
 	<dt>Additional Information:</dt>
-	<span style="text-indent:2em;">
 	<dt>Magic number(s):</dt>
 	<dd>PROV-XML documents are XML documents and thus may have initial strings similar to any XML document.</dd>
 	<dt>File extension(s):</dt>
 	<dd>.provx</dd>
 	<dt>Macintosh file type code(s):</dt>
 	<dd>&quot;TEXT&quot;</dd>
-	</span>
 	<dt>Person &amp; email address to contact for further information:</dt>
 	<dd>Ivan Herman, ivan@w3.org</dd>
 	<dt>Intended usage:</dt>
@@ -2305,8 +2320,6 @@
 
 
 
-
-<!-- Should this be folded or hid in some way until the user asks to see it? -->
 <section class="appendix" id="prov-xml-schema"> 
 <h2>XML Schema</h2>