--- a/examples/eg-25-extended-crime-file-example/rdf/extended-crime-file-pt1.ttl	Mon Nov 26 09:06:08 2012 -0500
+++ b/examples/eg-25-extended-crime-file-example/rdf/extended-crime-file-pt1.ttl	Mon Nov 26 09:12:37 2012 -0500
@@ -12,7 +12,7 @@
 .
 
 :derek
-   a prov:Person, prov:Agent, foaf:Person; ## prov:Agent is inferred from prov:Person
+   a foaf:Person, prov:Person, prov:Agent; ## prov:Agent is inferred from prov:Person
    foaf:givenName       "Derek";
    foaf:mbox            <mailto:derek@example.org>;
    prov:actedOnBehalfOf :national_newspaper_inc;
@@ -28,7 +28,7 @@
    foaf:name "Post Editor 3000";
 .   
 
-:government a prov:Organization, foaf:Organization .
+:government a foaf:Organization, prov:Organization, prov:Agent .
 
 :aggregatedByRegions
    a prov:Entity;

--- a/ontology/diagram-history/2012-07-09-david/expanded-terms-example-bundlePost.graffle	Mon Nov 26 09:06:08 2012 -0500
+++ b/ontology/diagram-history/2012-07-09-david/expanded-terms-example-bundlePost.graffle	Mon Nov 26 09:12:37 2012 -0500
@@ -3431,8 +3431,8 @@
 			<integer>2</integer>
 			<key>Points</key>
 			<array>
-				<string>{647.23221676868047, 150.58542295458079}</string>
-				<string>{694.3130109286044, 105.21791482714211}</string>
+				<string>{646.64141484937022, 150.35239857029862}</string>
+				<string>{691.57948729281225, 105.22540725137608}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -3456,7 +3456,7 @@
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{636.44196619804291, 46.205365091661577}, {177.33914615485457, 58.665596008300781}}</string>
+			<string>{{628.45286718577677, 46.205365091661577}, {185.32824516712083, 58.665596008300781}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>ID</key>
@@ -3483,7 +3483,8 @@
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\f0\fs24 \cf0 type=prov:SoftwareAgent\
+\f0\fs24 \cf0 type=prov:SoftwareAgent,\
+prov:Agent\
 \
 foaf:name="Post Editor 3000"}</string>
 				<key>VerticalPad</key>
@@ -3558,7 +3559,7 @@
 			<key>Points</key>
 			<array>
 				<string>{268.36028538147616, 51.314312489828929}</string>
-				<string>{242.33682296080008, 51.768784991334201}</string>
+				<string>{242.33658098830949, 52.243231073243635}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -3582,7 +3583,7 @@
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{27.727844643143133, 24.314312769499402}, {214.10905456542969, 58.665596008300781}}</string>
+			<string>{{27.727844643143129, 24.314312769499402}, {214.10905456542969, 63.536151885986328}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>ID</key>
@@ -3609,12 +3610,12 @@
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\f0\fs24 \cf0 type=prov:Organization\
+\f0\fs24 \cf0 type=prov:Organization, prov:Agent\
 \
 foaf:name="National Newspaper, Inc."}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
+			</dict>
+			<key>TextPlacement</key>
+			<integer>2</integer>
 		</dict>
 		<dict>
 			<key>Bounds</key>
@@ -3865,7 +3866,7 @@
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\f0\fs24 \cf0 type=prov:Person, foaf:Person\
+\f0\fs24 \cf0 type=prov:Person, prov:Agent\
 \
 foaf:givenName="Derek"\
 \
@@ -4317,7 +4318,7 @@
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2012-11-25 23:00:55 +0000</string>
+	<string>2012-11-26 14:10:56 +0000</string>
 	<key>Modifier</key>
 	<string>lebot</string>
 	<key>NotesVisible</key>