--- a/model/comments/issue-459-stian.txt	Wed Aug 08 14:49:28 2012 +0100
+++ b/model/comments/issue-459-stian.txt	Wed Aug 08 16:26:05 2012 +0100
@@ -290,7 +290,7 @@
 This is ISSUE-464.  I have reworded to avoid giving the impression
 that we require normalization, validity checking, or equivalence
 checking, but kept the summary - I feel it is important to summarize
-how the components fit together.
+how the components fit together.  Closed.
 
 8.
 
@@ -668,7 +668,8 @@
    > 
    >
 
-This is ISSUE-466.
+This is ISSUE-466.  This is closed, since the invalidation inferences
+reflect the resolution of issue 331.
 
  
 32.
@@ -792,7 +793,9 @@
    > 
 
 This is ISSUE-454 - as the inference is related to how derivation
-optional parameters work.
+optional parameters work.  Issue 454 was closed; we are determining
+whether we still need inference 12 given the current design of wasDerivedFrom.
+@TODO.
 
 37.
   > 
@@ -1236,7 +1239,7 @@
    > Shows wasStartedByActivity - now defunct relation. Remove.
    > 
 
-ISSUE-468. @Luc?
+ISSUE-468. Figure change.  @Luc?
 
 61.
 
@@ -1376,7 +1379,8 @@
    > activities."
    > 
 
-This is ISSUE-469
+This is ISSUE-469.  Strictly has been removed from
+entity-generation-invalidation-ordering.  Closed.
 
 68.
    > Constraint 38 and 40 are not shown in Figure 3.
@@ -1422,7 +1426,8 @@
    > reasoning for that to be strictly.
    > 
 
-This is ISSUE-470
+This is ISSUE-470.  Strictly has been removed from
+derivation-generation-use-ordering.  Closed.
 
 70.
 
@@ -1491,7 +1496,8 @@
 
 I revised the section to point out that an agent could be an activity.
 
-@Luc discuss?
+We have added the missing inferences to handle the case when the agent
+happens to be an activity, rather than an entity.
 
 74. 
    > 

--- a/model/prov-constraints.html	Wed Aug 08 14:49:28 2012 +0100
+++ b/model/prov-constraints.html	Wed Aug 08 16:26:05 2012 +0100
@@ -1728,11 +1728,10 @@
   class="name">wasDerivedFrom</span>, when an activity is explicit, and a generation known.</p>
 
 <p> However, a derivation without explicit generation and usage cannot be normalized even when a generation and usage hold.   
-<span class='conditional'>IF</span> 
-<span class="name">wasDerivedFrom(id; e2,e1,a,-,-,attrs)</span>,
+if <span class="name">wasDerivedFrom(id; e2,e1,a,-,-,attrs)</span>,
 <span class="name">wasGeneratedBy(gen; e2,a,_t2,_attrs2)</span>,
-and <span class="name">used(use; a,e1,_t1,[])</span>, <span
-class='conditional'>IT IS NOT NECESSARILY THE CASE THAT</span> 
+and <span class="name">used(use; a,e1,_t1,[])</span>, it is not
+  necessarily the case that
 <span
   class="name">wasDerivedFrom(id; e2,e1,a,gen,use,attrs)</span>.
 Indeed,
@@ -1907,10 +1906,11 @@
   <li>
     <span class="conditional">IF</span> <span class="name">wasInvalidatedBy(id; e,a,_t,attrs)</span> <span class="conditional">THEN</span> <span class="name">wasInfluencedBy(id;  e, a, attrs)</span>.
   </li>
+<!--
   <li>
     <span class="conditional">IF</span> <span class="name">wasDerivedFrom(id;  e2, e1, attrs)</span> <span class="conditional">THEN</span> <span class="name">wasInfluencedBy(id;  e2, e1, attrs)</span>.
   </li>
-
+-->
  <li>
     <span class="conditional">IF</span> <span class="name">wasAttributedTo(id; e,ag,attrs)</span> <span class="conditional">THEN</span> <span class="name">wasInfluencedBy(id; e, ag, attrs)</span>.
   </li>
@@ -3377,8 +3377,7 @@
    <span class='name'>wasDerivedFrom(id;  e2, e1, -, -, -, attrs)</span>  
 <span class='conditional'>THEN</span> 
 <span class="name">'entity' &isin; typeOf(e2)</span> AND
-<span class="name">'entity' &isin; typeOf(e1)</span> AND
-<span class="name">'activity' &isin; typeOf(a)</span>.
+<span class="name">'entity' &isin; typeOf(e1)</span>.
 
 <li>
 <span class='conditional'>IF</span> 
@@ -3587,7 +3586,7 @@
   validity:</p>
 
 <ol>
-  <li>Normalize the instance #<I>#, obtaining normalized instance <span class="math">I'</span>.  If
+  <li>Normalize the instance <span class="math">I</span>, obtaining normalized instance <span class="math">I'</span>.  If
   normalization fails, then <span class="math">I</span> is not <a>valid</a>.
   </li>
   <li>Apply all event ordering constraints to <span class="math">I'</span> to build a graph <span class="math">G</span> whose nodes
@@ -3603,7 +3602,7 @@
   <li>
   Check that none of the impossibility constraints <a href="#impossibility-constraints">(section 5.4)</a>  are
   violated.  If any are violated, then <span class="math">I</span> is
-  not <a>valid</a>.  Otherwise, #<I># is <a>valid</a>
+  not <a>valid</a>.  Otherwise, <span class="math">I</span> is <a>valid</a>
   </li>
   </ol>