--- a/microdata-rdf/index.html	Thu Nov 17 10:53:54 2011 -0800
+++ b/microdata-rdf/index.html	Thu Nov 17 17:48:58 2011 -0800
@@ -1015,16 +1015,18 @@
         For each <em>type</em> returned from
         <code><cite><a href="http://www.w3.org/TR/2011/WD-microdata-20110525/#dom-itemtype">element.itemType</a></cite></code>
         of the element defining the <tref>item</tref>.
-      </li>
-      <li>If <em>type</em> is an <tref>absolute URL</tref>, generate the following triple:
-        <dl class="triple">
-          <dt>subject</dt>
-          <dd><em>subject</em></dd>
-          <dt>predicate</dt>
-          <dd><code>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</code></dd>
-          <dt>object</dt>
-          <dd><em>type</em> (as a <tref>URI reference</tref>)</dd>
-        </dl>
+        <ol class="algorithm">
+          <li>If <em>type</em> is an <tref>absolute URL</tref>, generate the following triple:
+            <dl class="triple">
+              <dt>subject</dt>
+              <dd><em>subject</em></dd>
+              <dt>predicate</dt>
+              <dd><code>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</code></dd>
+              <dt>object</dt>
+              <dd><em>type</em> (as a <tref>URI reference</tref>)</dd>
+            </dl>
+          </li>
+        </ol>
       </li>
       <li>
         Set <em>type</em> to the first value returned from
@@ -1036,8 +1038,9 @@
       </li>
       <li>If the <tref>registry</tref> contains a <tref>URI prefix</tref> that is a character for character match of <em>type</em>
         up to the length of the <tref>URI prefix</tref>, set <em>vocab</em> as that <tref>URI prefix</tref>.
-      <li>Otherwise, construct <em>vocab</em> by removing everything following the last SOLIDUS U+002F ("/")
-        or NUMBER SIGN U+0023 ("#") from <em>type</em>.</li>
+      <li>Otherwise, if type is not empty, construct <em>vocab</em> by removing everything following the last
+        SOLIDUS U+002F ("/") or NUMBER SIGN U+0023 ("#") from <em>type</em>.</li>
+      <li>Update <tref>evaluation context</tref> setting <tref>current vocabulary</tref> to <em>vocab</em>.</li> 
       <li>
         Set <em>property list</em> to an empty array mapping properties to one or more
         <em>value</em>s as established below.
@@ -1052,8 +1055,8 @@
             For each <em>name</em> in the element's <tref>property names</tref>, run the following substeps:
             <ol class="algorithm">
               <li>
-                Let <em>context</em> to a copy of <tref>evaluation context</tref> with <tref>current type</tref> set
-                to <em>type</em> and <tref>current vocabulary</tref> set to <em>vocab</em>.
+                Let <em>context</em> be a copy of <tref>evaluation context</tref> with <tref>current type</tref> set
+                to <em>type</em>.
               <li>
                 Let <em>predicate</em> be the result of <a href="generate-predicate-uri">generate predicate URI</a>
                 using <em>context</em> and <em>name</em>.
@@ -1078,8 +1081,8 @@
         For each <em>predicate</em> in <em>property list</em>:
         <ol class="algorithm">
           <li><a href="#generate-property-values">Generate property values</a> using a copy of
-            <tref>evaluation context</tref> with
-            <tref>current vocabulary</tref> set to <em>vocab</em> along with <em>subject</em>, <em>predicate</em> and
+            <tref>evaluation context</tref> along with
+            <em>subject</em>, <em>predicate</em> and
             the list of values associated with <em>predicate</em> from <em>property list</em> as <em>values</em>.
           </li>
         </ol>
@@ -1281,7 +1284,7 @@
 @prefix md: <http://www.w3.org/ns/md#> .
 @prefix frbr: <http://purl.org/vocab/frbr/core#> .
 
-<> md:item <works/45U8QJGZSQKDH8N> .
+<> md:item (<works/45U8QJGZSQKDH8N>) .
 
 <works/45U8QJGZSQKDH8N> a frbr:Work ;
   dc:creator "Wil Wheaton"@en ;
@@ -1420,7 +1423,7 @@
       "episodes": "list",
       "events": "list",
       "founders": "list",
-      "itemListElement", "list",
+      "itemListElement": "list",
       "musicGroupMember": "list",
       "performerIn": "list",
       "performers": "list",