--- a/model/prov-dm.html	Tue May 29 14:39:35 2012 +0100
+++ b/model/prov-dm.html	Tue May 29 14:51:34 2012 +0100
@@ -552,17 +552,17 @@
 <caption id="overview-types-and-relations">Table 2: Mapping of PROV core concepts to  types and relations</caption>
 <tr><td><a><b>PROV Concepts</b></a></td><td><b>PROV-DM types or relations</b></td><td><b>Name</b></td><td><b>Overview</b></td></tr>
 <tr>
-<td><a>Entity</a></td><td rowspan="3" style="text-align: center;">PROV-DM Types</td><td><a title="dfn-Entity">entity</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
-<tr><td><a>Activity</a></td><td><a title="dfn-Activity">activity</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
-<tr><td><a>Agent</a></td><td><a title="dfn-agent">agent</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.2</a></td></tr>
+<td><a>Entity</a></td><td rowspan="3" style="text-align: center;">PROV-DM Types</td><td><a title="dfn-Entity">Entity</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
+<tr><td><a>Activity</a></td><td><a title="dfn-Activity">Activity</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
+<tr><td><a>Agent</a></td><td><a title="dfn-agent">Agent</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.2</a></td></tr>
 <tr>
 <td><a>Generation</a></td><td rowspan="7" style="text-align: center;">PROV-DM Relations</td><td><a title="wasGeneratedBy">wasGeneratedBy</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
-<tr><td><a>Usage</a></td><td><a title="used">used</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
-<tr><td><a>Communication</a></td><td><a title="wasInformedBy">wasInformedBy</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
-<tr><td><a>Derivation</a></td><td><a title="wasDerivedFrom">wasDerivedFrom</a></td><td style="text-align: center;"><a href="#section-derivation">2.1.2</a></td></tr>
-<tr><td><a>Attribution</a></td><td><a title="wasAttributedTo">wasAttributedTo</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.3</a></td></tr>
-<tr><td><a>Association</a></td><td><a title="wasAssociatedWith">wasAssociatedWith</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.3</a></td></tr>
-<tr><td><a>Delegation</a></td><td><a title="actedOnBehalfOf">actedOnBehalfOf</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.3</a></td></tr>
+<tr><td><a>Usage</a></td><td><a title="used">Used</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
+<tr><td><a>Communication</a></td><td><a title="wasInformedBy">WasInformedBy</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
+<tr><td><a>Derivation</a></td><td><a title="wasDerivedFrom">WasDerivedFrom</a></td><td style="text-align: center;"><a href="#section-derivation">2.1.2</a></td></tr>
+<tr><td><a>Attribution</a></td><td><a title="wasAttributedTo">WasAttributedTo</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.3</a></td></tr>
+<tr><td><a>Association</a></td><td><a title="wasAssociatedWith">WasAssociatedWith</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.3</a></td></tr>
+<tr><td><a>Delegation</a></td><td><a title="actedOnBehalfOf">ActedOnBehalfOf</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.3</a></td></tr>
 </table>
 </div>
 
@@ -1341,11 +1341,11 @@
 <caption id="relations-at-a-glance">Table 4: PROV-DM Relations At a Glance</caption>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td colspan="3">Object</td></tr> 
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td>Entity</td><td>Activity</td><td>Agent</td></tr> 
-<tr><td rowspan="3">Subject</td><td>Entity</td><td><div class="component3-color"><a class="essential">wasDerivedFrom</a><br><a>wasRevisionOf</a><br><a>wasQuotedFrom</a><br><a>hadOriginalSource</a></div><div class="component4-color"><a>alternateOf</a><br><a>specializationOf</a></div></td><td class="component1-color"><a class="essential"
-title="wasGeneratedBy">wasGeneratedBy</a><br><a
-title="wasInvalidatedBy">wasInvalidatedBy</a></td><td class="component2-color"><a class="essential">wasAttributedTo</a></td></tr>
-<tr><td>Activity</td><td><div class="component1-color"><a class="essential">used</a><br><a>wasStartedBy</a><br><a>wasEndedBy</a></div></td><td class="component1-color"><a class="essential">wasInformedBy</a></td><td class="component2-color"><a class="essential">wasAssociatedWith</a></td></tr>
-<tr><td>Agent</td><td>&mdash;</td><td>&mdash;</td><td class="component2-color"><a class="essential">actedOnBehalfOf</a></td></tr>
+<tr><td rowspan="3">Subject</td><td>Entity</td><td><div class="component3-color"><a class="essential">WasDerivedFrom</a><br><a>WasRevisionOf</a><br><a>WasQuotedFrom</a><br><a>HadOriginalSource</a></div><div class="component4-color"><a>AlternateOf</a><br><a>SpecializationOf</a></div></td><td class="component1-color"><a class="essential"
+title="wasGeneratedBy">WasGeneratedBy</a><br><a
+title="wasInvalidatedBy">WasInvalidatedBy</a></td><td class="component2-color"><a class="essential">WasAttributedTo</a></td></tr>
+<tr><td>Activity</td><td><div class="component1-color"><a class="essential">Used</a><br><a>WasStartedBy</a><br><a>WasEndedBy</a></div></td><td class="component1-color"><a class="essential">WasInformedBy</a></td><td class="component2-color"><a class="essential">WasAssociatedWith</a></td></tr>
+<tr><td>Agent</td><td>&mdash;</td><td>&mdash;</td><td class="component2-color"><a class="essential">ActedOnBehalfOf</a></td></tr>
 </table>
 </div>
 
@@ -1368,23 +1368,25 @@
 <tr class="component1-color"><td><a>Invalidation</a></td><td><a title="wasInvalidatedBy">wasInvalidatedBy(id;e,a,t,attrs)</a></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
-<tr class="component2-color" style="border-collapse: collapse; "><td  class="essential"><a>Agent</a></td><td><a title="dfn-agent" class="essential">agent(id, [ attr1=val1, ...])</a></td><td  rowspan="8"><a href="#component2">Component 2: agents/responsibility</a></td></tr>
-<tr class="component2-color"><td class="essential"><a>Attribution</a></td><td><a title="wasAttributedTo"><span class="essential">wasAttributedTo(</span>id;<span class="essential">e,ag</span>,attr<span class="essential">)</span></a></td></tr>
-<tr class="component2-color"><td class="essential"><a>Association</a></td><td><a title="wasAssociatedWith"><span class="essential">wasAssociatedWith(</span>id;<span class="essential">a,ag</span>,pl,attrs<span class="essential">)</span></a></td></tr>
-<tr class="component2-color"><td class="essential"><a>Delegation</a></td><td><a title="actedOnBehalfOf"><span class="essential">actedOnBehalfOf(</span>id;<span class="essential">ag2,ag1</span>,a,attrs<span class="essential">)</span></a></td></tr>
-<tr class="component2-color"><td class="provType"><a>Plan</a></td><td><a title="plan">... prov:type='prov:Plan' ...</a></td>
-<tr class="component2-color"><td class="provType"><a>Person</a></td><td><a title="person">... prov:type='prov:Person' ...</a></td>
-<tr class="component2-color"><td class="provType"><a>Organization</a></td><td><a title="organization">... prov:type='prov:Organization' ...</a></td>
-<tr class="component2-color"><td class="provType"><a title="software-agent">SoftwareAgent</a></td><td><a title="software-agent">... prov:type='prov:SoftwareAgent' ...</a></td>
+
+<tr class="component2-color"><td class="essential"><a>Derivation</a></td><td><a title="wasDerivedFrom"><span class="essential">wasDerivedFrom(</span>id; <span class="essential">e2, e1</span>, a, g2, u1, attrs<span class="essential">)</span></a></td><td  rowspan="5"><a href="#component2">Component 2: derivation</a></td></tr>
+<tr class="component2-color"><td class="provType"><a>Revision</a></td><td><a title="revision">... prov:type='prov:WasRevisionOf' ...</a></td></tr>
+<tr class="component2-color"><td class="provType"><a>Quotation</a></td><td><a title="quotation">... prov:type='prov:WasQuotedFrom' ...</a></td></tr>
+<tr class="component2-color"><td class="provType"><a>Original Source</a></td><td><a title="Original Source">... prov:type='prov:HadOriginalSource' ...</a></td></tr>
+<tr class="component2-color"><td><a>Trace</a></td><td><a title="tracedTo">tracedTo(id;e2,e1,attrs)</a></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
-<tr class="component3-color"><td class="essential"><a>Derivation</a></td><td><a title="wasDerivedFrom"><span class="essential">wasDerivedFrom(</span>id; <span class="essential">e2, e1</span>, a, g2, u1, attrs<span class="essential">)</span></a></td><td  rowspan="5"><a href="#component3">Component 3: derivation</a></td></tr>
-<tr class="component3-color"><td class="provType"><a>Revision</a></td><td><a title="revision">... prov:type='prov:WasRevisionOf' ...</a></td></tr>
-<tr class="component3-color"><td class="provType"><a>Quotation</a></td><td><a title="quotation">... prov:type='prov:WasQuotedFrom' ...</a></td></tr>
-<tr class="component3-color"><td class="provType"><a>Original Source</a></td><td><a title="Original Source">... prov:type='prov:HadOriginalSource' ...</a></td></tr>
-<tr class="component3-color"><td><a>Trace</a></td><td><a title="tracedTo">tracedTo(id;e2,e1,attrs)</a></td></tr>
+<tr class="component3-color" style="border-collapse: collapse; "><td  class="essential"><a>Agent</a></td><td><a title="dfn-agent" class="essential">agent(id, [ attr1=val1, ...])</a></td><td  rowspan="8"><a href="#component3">Component 3: agents/responsibility</a></td></tr>
+<tr class="component3-color"><td class="essential"><a>Attribution</a></td><td><a title="wasAttributedTo"><span class="essential">wasAttributedTo(</span>id;<span class="essential">e,ag</span>,attr<span class="essential">)</span></a></td></tr>
+<tr class="component3-color"><td class="essential"><a>Association</a></td><td><a title="wasAssociatedWith"><span class="essential">wasAssociatedWith(</span>id;<span class="essential">a,ag</span>,pl,attrs<span class="essential">)</span></a></td></tr>
+<tr class="component3-color"><td class="essential"><a>Delegation</a></td><td><a title="actedOnBehalfOf"><span class="essential">actedOnBehalfOf(</span>id;<span class="essential">ag2,ag1</span>,a,attrs<span class="essential">)</span></a></td></tr>
+<tr class="component3-color"><td class="provType"><a>Plan</a></td><td><a title="plan">... prov:type='prov:Plan' ...</a></td>
+<tr class="component3-color"><td class="provType"><a>Person</a></td><td><a title="person">... prov:type='prov:Person' ...</a></td>
+<tr class="component3-color"><td class="provType"><a>Organization</a></td><td><a title="organization">... prov:type='prov:Organization' ...</a></td>
+<tr class="component3-color"><td class="provType"><a title="software-agent">SoftwareAgent</a></td><td><a title="software-agent">... prov:type='prov:SoftwareAgent' ...</a></td>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
+
 <tr class="component4-color"><td><a>Alternate</a></td><td><a title="alternateOf">alternateOf(alt1, alt2)</a></td><td  rowspan="2"><a href="#component4">Component 4: alternate</a></td></tr>
 <tr class="component4-color"><td><a>Specialization</a></td><td><a title="specializationOf">specializationOf(sub, super)</a></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
@@ -1866,7 +1868,7 @@
 <div style="text-align: center;">
 <figure>
 <!-- <img src="images/Derivation.png" alt="derivation"/> -->
-<img src="uml/component3.png" alt="derivation"/>
+<img src="uml/component2.png" alt="derivation"/>
 <figcaption id="figure-component2">Figure 6: Derivation Component Overview</figcaption>
 </figure>
 </div>
@@ -2072,7 +2074,7 @@
 <div style="text-align: center;">
 <figure>
 <!-- <img src="images/Agents-Responsibility.png" alt="agents and responsibilities"/> -->
-<img src="uml/component2.png" alt="agents and responsibilities"/>
+<img src="uml/component3.png" alt="agents and responsibilities"/>
 <figcaption id="figure-component3">Figure 7: Agents and Responsibility Component Overview</figcaption>
 </figure>
 </div>