--- a/spec/latest/json-ld-api/index.html	Wed Feb 27 21:00:07 2013 +0100
+++ b/spec/latest/json-ld-api/index.html	Wed Feb 27 21:09:19 2013 +0100
@@ -745,9 +745,15 @@
           the <code>@graph</code> keyword.</li>
       </ul>
     </dd>
+    <dt><tdef>value object</tdef></dt>
+    <dd>A <tref>value object</tref> is a <tref>JSON object</tref> that has an <code>@value</code>
+      member.</dd>
     <dt><tdef>list object</tdef></dt>
     <dd>A <tref>list object</tref> is a <tref>JSON object</tref> that has an <code>@list</code>
       member.</dd>
+    <dt><tdef>set object</tdef></dt>
+    <dd>A <tref>set object</tref> is a <tref>JSON object</tref> that has an <code>@set</code>
+      member.</dd>
     <dt><tdef>scalar</tdef></dt>
     <dd>A scalar is either a JSON <tref>string</tref>, <tref>number</tref>, <tref>true</tref>,
       or <tref>false</tref>.</dd>
@@ -1497,7 +1503,7 @@
             <li>If <em>key</em>'s <tref>container mapping</tref> in
               <tref>active context</tref> is <code>@language</code> and
               <em>value</em> is a <tref>JSON object</tref> then <em>value</em>
-              is expanded from a <tref>language map</tref> as follows:
+              is expanded from a <tref href="../json-ld-syntax/#dfn-language-map">language map</tref> as follows:
               <ol class="algorithm">
                 <li>Initialize <em>expanded value</em> to an empty
                   <tref>array</tref>.</li>
@@ -4043,7 +4049,7 @@
           i.e., the value was neither a <tref>string</tref> nor an <tref>array</tref>
           of <tref title="string">strings</tref>.</dd>
         <dt>invalid value object</dt>
-        <dd>A <tdef>value object</tdef> with disallowed members has been
+        <dd>A <tref>value object</tref> with disallowed members has been
           detected.</dd>
         <dt>invalid value object value</dt>
         <dd>An invalid value for the <code>@value</code> member of a
@@ -4053,11 +4059,11 @@
         <dd>A <tref>language-tagged string</tref> with an invalid language
           value was detected.</dd>
         <dt>invalid set or list object</dt>
-        <dd>A <tdef>set object</tdef> or <tref>list object</tref> with
+        <dd>A <tref>set object</tref> or <tref>list object</tref> with
           disallowed members has been detected.</dd>
         <dt>invalid language map value</dt>
-        <dd>An invalid value in a <tdef>language map</tdef> was detected. It has
-          to be a <tref>string</tref> or an <tref>array</tref> of
+        <dd>An invalid value in a <tref href="../json-ld-syntax/#dfn-language-map">language map</tref>
+          has been detected. It has to be a <tref>string</tref> or an <tref>array</tref> of
           <tref title="string">strings</tref>.</dd>
         <dt>compaction to list of lists</dt>
         <dd>The compacted document contains a list of lists as multiple