--- a/model/glossary.html	Tue Feb 28 17:10:51 2012 +0100
+++ b/model/glossary.html	Tue Feb 28 17:31:52 2012 +0100
@@ -14,8 +14,7 @@
 </span>
 
 <span class="glossary" id="glossary-agent">  
-An <dfn id="concept-agent">agent</dfn> is a type of entity that can be associated to an activity, to indicate that it bears some form of responsibility for the activity taking
-place.
+An <dfn id="concept-agent">agent</dfn> is a type of entity that bears some form of responsibility for an activity taking place.
 </span>
 
 <span class="glossary" id="glossary-generation">  
@@ -29,7 +28,7 @@
 </span>
 
 <span class="glossary" id="glossary-derivation">  
-A <dfn id="concept-derivation">derivation</dfn>  is anything that transforms an entity into another, that creates an entity from another, or modifies an entity to another.</span>
+A <dfn id="concept-derivation">derivation</dfn>  is anything that transforms an entity into another, that constructs an entity from another, or that updates an entity, resulting in a new one.</span>
 
 
 

--- a/model/glossary.js	Tue Feb 28 17:10:51 2012 +0100
+++ b/model/glossary.js	Tue Feb 28 17:31:52 2012 +0100
@@ -21,8 +21,7 @@
 '</span> ' + 
 ' ' + 
 '<span class="glossary" id="glossary-agent">   ' + 
-'An <dfn id="concept-agent">agent</dfn> is a type of entity that can be associated to an activity, to indicate that it bears some form of responsibility for the activity taking ' + 
-'place. ' + 
+'An <dfn id="concept-agent">agent</dfn> is a type of entity that bears some form of responsibility for an activity taking place.' + 
 '</span> ' + 
 ' ' + 
 '<span class="glossary" id="glossary-generation">   ' + 
@@ -36,7 +35,7 @@
 '</span> ' + 
 ' ' + 
 '<span class="glossary" id="glossary-derivation">   ' + 
-'A <dfn id="concept-derivation">derivation</dfn>  is anything that transforms an entity into another, that creates an entity from another, or modifies an entity to another.</span> ' + 
+'A <dfn id="concept-derivation">derivation</dfn>  is anything that transforms an entity into another, that constructs an entity from another, or that updates an entity, resulting in a new one.</span> ' + 
 ' ' + 
 ' ' + 
 ' ' +