--- a/org/index.html	Thu Nov 21 11:48:12 2013 +0000
+++ b/org/index.html	Thu Nov 21 11:55:55 2013 +0000
@@ -265,6 +265,58 @@
 
 <img src="img/OrgOntology20130502.png" alt="Diagram depicting core classes and relationships">
 
+<h3>Index of classes and properties</h3>
+
+<p><strong>Classes:</strong> 
+ | <a href="#org:ChangeEvent">ChangeEvent</a> 
+ | <a href="#org:FormalOrganization">FormalOrganization</a> 
+ | <a href="#org:Membership">Membership</a> 
+ | <a href="#org:OrganizationalCollaboration">OrganizationalCollaboration</a> 
+ | <a href="#org:OrganizationalUnit">OrganizationalUnit</a> 
+ | <a href="#org:Organization">Organization</a> 
+ | <a href="#org:Post">Post</a> 
+ | <a href="#org:Role">Role</a> 
+ | <a href="#org:Site">Site</a> |
+</p>
+
+<p><strong>Properties:</strong> 
+ | <a href="#org:basedAt">basedAt</a>
+  | <a href="#org:changedBy">changedBy</a>
+  | <a href="#org:classification">classification</a>
+  | <a href="#org:hasMember">hasMember</a>
+  | <a href="#org:hasMembership">hasMembership</a>
+  | <a href="#org:hasPost">hasPost</a>
+  | <a href="#org:hasPrimarySite">hasPrimarySite</a>
+  | <a href="#org:hasRegisteredSite">hasRegisteredSite</a>
+  | <a href="#org:hasSite">hasSite</a>
+  | <a href="#org:hasSubOrganization">hasSubOrganization</a>
+  | <a href="#org:hasUnit">hasUnit</a>
+  | <a href="#org:headOf">headOf</a>
+  | <a href="#org:heldBy">heldBy</a>
+  | <a href="#org:holds">holds</a>
+  | <a href="#org:identifier">identifier</a>
+  | <a href="#org:linkedTo">linkedTo</a>
+  | <a href="#org:location">location</a>
+  | <a href="#org:memberDuring">memberDuring</a>
+  | <a href="#org:memberOf">memberOf</a>
+  | <a href="#org:member">member</a>
+  | <a href="#org:organization">organization</a>
+  | <a href="#org:originalOrganization">originalOrganization</a>
+  | <a href="#org:postIn">postIn</a>
+  | <a href="#org:purpose">purpose</a>
+  | <a href="#org:remuneration">remuneration  </a>
+  | <a href="#org:reportsTo">reportsTo</a>
+  | <a href="#org:resultedFrom">resultedFrom</a>
+  | <a href="#org:resultingOrganization">resultingOrganization</a>
+  | <a href="#org:role">role</a>
+  | <a href="#org:roleProperty">roleProperty</a>
+  | <a href="#org:siteAddress">siteAddress</a>
+  | <a href="#org:siteOf">siteOf</a>
+  | <a href="#org:subOrganizationOf">subOrganizationOf</a>
+  | <a href="#org:transitiveSubOrganizationOf">transitiveSubOrganizationOf</a>
+  | <a href="#org:unitOf">unitOf</a> |
+</p>
+
 <section class="informative">
 <h3 id="example">Example</h3>
 <p>This example illustrates a small fragment of the organizational
@@ -1789,8 +1841,16 @@
 
 <h2 id="change-log">Change history</h2>
 
+<p>Changes since <a href="http://www.w3.org/TR/2013/CR-vocab-org-20130625/">W3C Candidate Recommendation 25 June 2013</a>:</p>
+
+<ul>
+  <li>Updated the diagram in section 1 to a clearer, more complete version, thanks to João Paulo Almeida.</li>
+  <li>Added namespace and links to vocabulary file to the Abstract for ease of reference.</li>
+  <li>Duplicated the index of vocabulary terms earlier in the document for ease of reference.</li>
+</ul>
+
 <p>Changes since <a href="http://www.w3.org/TR/2012/WD-vocab-org-20121023/">W3C
-    Working Draft 23 October 2012 (Last Call)</a>:
+    Working Draft 23 October 2012 (Last Call)</a>:</p>
 
 <ul>
   <li>Added explicit declarations that <a href="#org:member">org:member</a> and <a href="#org:organization">org:organization</a> are functional properties. This is a clarification rather than an intended change of semantics.</li>
@@ -1816,7 +1876,7 @@
   <li>Marked the normative use of OWL Time as At Risk.</li>
 </ul>
 
-<p>Changes since <a href="http://www.w3.org/TR/2012/WD-vocab-org-20120405/">W3C Working Draft 05 April 2012</a>:
+<p>Changes since <a href="http://www.w3.org/TR/2012/WD-vocab-org-20120405/">W3C Working Draft 05 April 2012</a>:</p>
 
 <ul>
   <li>Modified <a href="#org:ChangeEvent">org:ChangeEvent</a>, <a href="#org:originalOrganization">org:originalOrganization</a> and