--- a/spec/latest/json-ld-api/index.html	Sun Apr 01 00:44:23 2012 +0800
+++ b/spec/latest/json-ld-api/index.html	Sun Apr 01 02:24:08 2012 +0800
@@ -1210,17 +1210,17 @@
             Continue with the next property from <em>element</em>.
             <p class="issue">This is currently being discussed in <a href="https://github.com/json-ld/json-ld.org/issues/92">ISSUE 92</a></p>
           </li>
-          <li>If the <em>expanded property</em> is <code>@id</code> and the <em>value</em> is a <tref>string</tref>,
-            expand the <em>value</em> according to <a href="#iri-expansion">IRI Expansion</a>.</li>
+          <li>If the <em>expanded property</em> is <code>@id</code> the <em>value</em> MUST be a <tref>string</tref>.
+            Expand the <em>value</em> according to <a href="#iri-expansion">IRI Expansion</a>.</li>
           <li>Otherwise, if the <em>expanded property</em> is <code>@type</code> and the <em>value</em>
             is a <tref>string</tref> expand <em>value</em> according to <a href="#iri-expansion">IRI Expansion</a>.
             If <em>element</em> has no <code>@value</code> property (or an alias thereof), replace <em>value</em>
             with an array whose only value is the expanded <em>value</em>.</li>
           <li>Otherwise, if the <em>expanded property</em> is <code>@type</code> and the
             <em>value</em> is an <tref>array</tref>, expand every entry according to
-            <a href="#iri-expansion">IRI Expansion</a>.</li>
-          <li>Otherwise, if the <em>expanded property</em> is <code>@value</code>,
-            the <em>value</em> is not subject to further expansion.</li>
+            <a href="#iri-expansion">IRI Expansion</a>. Element MUST NOT have a <code>@value</code> property in this case.</li>
+          <li>Otherwise, if the <em>expanded property</em> is <code>@value</code> or <code>@language</code>, the <em>value</em>
+            is not subject to further expansion.</li>
           <li>Otherwise, if the <em>expanded property</em> is <code>@graph</code>,
             replace the entire object with the result of performing this algorithm on the members
             of the <em>value</em> and terminate further processing of this object.</li>
@@ -1232,9 +1232,8 @@
                 current <em>value</em> updated by recursively using this algorithm.</li>
               <li>Otherwise, if <em>value</em> is not an <tref>array</tref>, replace <em>value</em>
                 with an array containing <em>value</em>.</li>
-              <li>If <em>value</em> is an <tref>array</tref>, process each entry in the <tref>array</tref>
-                recursively using this algorithm, passing copies of the <tref>active context</tref> and
-                <tref>active property</tref>.</li>
+              <li>If <em>value</em> is an <tref>array</tref>, process it recursively using this algorithm,
+                passing copies of the <tref>active context</tref> and <tref>active property</tref>.</li>
             </ol>
           </li>
           <li>If output object already contains an entry for <em>expanded property</em>, append <em>value</em> to