--- a/model/prov-constraints.html	Fri Jun 01 14:12:31 2012 +0100
+++ b/model/prov-constraints.html	Fri Jun 01 14:47:26 2012 +0100
@@ -458,22 +458,22 @@
 
 <p>
 
-<div class="note">Table: work in progress</div>
+<div class="note">Table: work in progress. Done up to constraint 25.</div>
 
 <div id="prov-dm-constraints-fig" style="text-align: left;">
 <table  class="thinborder" style="margin-left: auto; margin-right: auto;">
 <caption id="prov-dm-constraints">Table 5: Summary of definitions, constraints, and inferences for PROV-DM Types and Relations</caption>
-<tr><td><a><b>Type or Relation Name</b></a></td><td><b>Definitiosn, Constraints, Inferences</b></td><td><b>Component</b></td></tr>
+<tr><td><a><b>Type or Relation Name</b></a></td><td><b>Definitions, Constraints, Inferences</b></td><td><b>Component</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
-<tr class="component1-color"><td class="essential"><a>Entity</a></td><td><a class="rule-text" href="#entity-unique"><span>TBD</span></a></td><td rowspan="8"><a href="#component1">Component 1: Entities/Activities</a></td></tr>
-<tr class="component1-color"><td class="essential"><a>Activity</a></td><td><a class="rule-text" href="#activity-unique"><span>TBD</span></a><br><a class="rule-text" href="#unique-startTime"><span>TBD</span></a><br><a class="rule-text" href="#unique-endTime"><span>TBD</span></a></td></tr>
-<tr class="component1-color"><td class="essential"><a>Generation</a></td><td> </td></tr>
-<tr class="component1-color"><td class="essential"><a>Usage</a></td><td> </td></tr>
+<tr class="component1-color"><td class="essential"><a>Entity</a></td><td><a class="rule-text" href="#entity-unique"><span>TBD</span></a><br><a class="rule-text" href="#unique-generation-time"><span>TBD</span></a><br><a class="rule-text" href="#unique-invalidation-time"><span>TBD</span></a></td><td rowspan="8"><a href="#component1">Component 1: Entities/Activities</a></td></tr>
+<tr class="component1-color"><td class="essential"><a>Activity</a></td><td><a class="rule-text" href="#activity-unique"><span>TBD</span></a><br><a class="rule-text" href="#unique-startTime"><span>TBD</span></a><br><a class="rule-text" href="#unique-endTime"><span>TBD</span></a><br><a class="rule-text" href="#usage-within-activity"><span>TBD</span></a><br><a class="rule-text" href="#generation-within-activity"><span>TBD</span></a></td></tr>
+<tr class="component1-color"><td class="essential"><a>Generation</a></td><td><a class="rule-text" href="#generation-uniqueness"><span>TBD</span></a><br><a class="rule-text" href="#unique-generation-time"><span>TBD</span></a><br><a class="rule-text" href="#generation-within-activity"><span>TBD</span></a> </td></tr>
+<tr class="component1-color"><td class="essential"><a>Usage</a></td><td><a class="rule-text" href="#usage-within-activity"><span>TBD</span></a> </td></tr>
 <tr class="component1-color"><td class="essential"><a>Communication</a></td><td><a class="rule-text" href="#wasInformedBy-definition"><span>TBD</span></a> </td></tr>
-<tr class="component1-color"><td><a>Start</a></td><td><a class="rule-text" href="#wasStartedBy-definition"><span>TBD</span></a> </td></tr>
-<tr class="component1-color"><td><a>End</a></td><td><a class="rule-text" href="#wasEndedBy-definition"><span>TBD</span></a> </td></tr>
-<tr class="component1-color"><td><a>Invalidation</a></td><td> </td></tr>
+<tr class="component1-color"><td><a>Start</a></td><td><a class="rule-text" href="#wasStartedBy-definition"><span>TBD</span><br></a><a class="rule-text" href="#unique-startTime"><span>TBD</span></a><br> <a class="rule-text" href="#start-precedes-end"><span>TBD</span></a></td></tr>
+<tr class="component1-color"><td><a>End</a></td><td><a class="rule-text" href="#wasEndedBy-definition"><span>TBD</span></a><br><a class="rule-text" href="#unique-endTime"><span>TBD</span></a> <br> <a class="rule-text" href="#start-precedes-end"><span>TBD</span></a></td></tr>
+<tr class="component1-color"><td><a>Invalidation</a></td><td><a class="rule-text" href="#unique-invalidation-time"><span>TBD</span></a></td> </td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
@@ -499,17 +499,17 @@
 <tr class="component4-color"><td><a>Specialization</a></td><td><a class="rule-text" href="#specialization-irreflexive"><span>TBD</span></a><br><a class="rule-text" href="#specialization-transitive"><span>TBD</span></a><br><a class="rule-text" href="#specialization-antisymmetric"><span>TBD</span></a><br><a class="rule-text" href="#specialization-alternate"><span>TBD</span></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="component5-color"><td><a title="bundle">Bundle constructor</a></td><td><a title="dfn-bundle">bundle id description_1 ... description_n endBundle</a></td><td  rowspan="3"><a href="#component5">Component 5: Bundles</a></td></tr>
-<tr class="component5-color"><td class="provType"><a title="bundle">Bundle type</a></td><td><a>... prov:type='prov:Bundle' ...</a></td></tr>
-<tr class="component5-color"><td><a>Provenance Locator</a></td><td><a title="hasProvenanceIn">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</a></td></tr>
+<tr class="component5-color"><td><a title="bundle">Bundle constructor</a></td><td></td><td  rowspan="3"><a href="#component5">Component 5: Bundles</a></td></tr>
+<tr class="component5-color"><td class="provType"><a title="bundle">Bundle type</a></td><td> </td></tr>
+<tr class="component5-color"><td><a>Provenance Locator</a></td><td></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
-<tr class="component6-color"><td class="provType"><a>Collection</a></td><td><a title="collection">... prov:type='prov:Collection' ...</a></td><td  rowspan="6"><a href="#component6">Component 6: Collections</a></td></tr>
-<tr class="component6-color"><td class="provType"><a>Dictionary</a></td><td><a title="dictionary">... prov:type='prov:Dictionary' ...</a></td></tr>
-<tr class="component6-color"><td class="provType"><a title="empty dictionary">EmptyDictionary</a></td><td><a title="empty dictionary">... prov:type='prov:EmptyDictionary' ...</a></td></tr>
-<tr class="component6-color"><td><a>Insertion</a></td><td><a title="derivedByInsertionFrom">derivedByInsertionFrom(id; c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</a></td></tr>
-<tr class="component6-color"><td><a>Removal</a></td><td><a title="derivedByRemovalFrom">derivedByRemovalFrom(id; c2, c1, {key_1, ... key_n}, attrs)</a></td></tr>
-<tr class="component6-color"><td><a>Membership</a></td><td><a title="memberOf">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})</a></td></tr>
+<tr class="component6-color"><td class="provType"><a>Collection</a></td><td> </td><td  rowspan="6"><a href="#component6">Component 6: Collections</a></td></tr>
+<tr class="component6-color"><td class="provType"><a>Dictionary</a></td><td> </td></tr>
+<tr class="component6-color"><td class="provType"><a title="empty dictionary">EmptyDictionary</a></td><td> </a></td></tr>
+<tr class="component6-color"><td><a>Insertion</a></td><td> </td></tr>
+<tr class="component6-color"><td><a>Removal</a></td><td> </td></tr>
+<tr class="component6-color"><td><a>Membership</a></td><td> </td></tr>
 </table>
 </div>