diff --git a/mlz-amlaw.csl b/mlz-amlaw.csl
index e819ac9..ee8b14b 100644
--- a/mlz-amlaw.csl
+++ b/mlz-amlaw.csl
@@ -153,7 +153,7 @@
         <if locator="page paragraph" match="none">
           <label form="short" variable="locator"/>
         </if>
-        <else-if locator="page paragraph">
+        <else-if locator="page paragraph" match="any">
           <text term="at"/>
         </else-if>
       </choose>
@@ -707,27 +707,44 @@
         <conditions match="all">
           <condition type="book song motion_picture" match="any"/>
           <condition variable="title version" match="all"/>
-          <condition disambiguate="true" position="first" context="bibliography" match="any"/>
+          <condition position="first" context="bibliography" match="none"/>
+        </conditions>
+        <choose>
+          <if variable="hereinafter">
+            <text text-case="title" variable="hereinafter"/>
+          </if>
+          <else-if>
+            <conditions match="any">
+              <condition disambiguate="true"/>
+              <condition variable="author" match="none"/>
+            </conditions>
+            <text text-case="title" form="short" variable="title"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if>
+        <conditions match="all">
+          <condition type="book song motion_picture" match="any"/>
+          <condition variable="title version" match="all"/>
           <condition is-numeric="version" match="all"/>
         </conditions>
         <group delimiter=", ">
-          <text form="short" text-case="title" variable="title"/>
+          <text text-case="title" variable="title"/>
           <group delimiter=" ">
             <text value="ver."/>
             <text variable="version"/>
           </group>
           <text form="short" variable="medium"/>
         </group>
-      </if>
+      </else-if>
       <else-if>
         <conditions match="all">
           <condition type="book song motion_picture" match="any"/>
           <condition variable="title version" match="all"/>
-          <condition disambiguate="true" position="first" context="bibliography" match="any"/>
           <condition is-numeric="version" match="none"/>
         </conditions>
         <group delimiter=", ">
-          <text form="short" text-case="title" variable="title"/>
+          <text text-case="title" variable="title"/>
           <text quotes="true" variable="version"/>
           <text form="short" variable="medium"/>
         </group>
@@ -740,10 +757,10 @@
         <choose>
           <if>
             <conditions match="any">
-              <condition position="first" context="bibliography" disambiguate="true" match="any"/>
+              <condition position="first" context="bibliography" match="any"/>
               <condition variable="author container-author" match="none"/>
             </conditions>
-            <text form="short" text-case="title" variable="title"/>
+            <text text-case="title" variable="title"/>
           </if>
         </choose>
       </else-if>
@@ -755,8 +772,12 @@
           <condition type="song" variable="collection-title" match="nand"/> 
         </conditions>
         <choose>
-          <if position="subsequent" disambiguate="true" variable="title-short" match="all">
-            <text font-variant="small-caps" form="short" text-case="title" variable="title-short"/>
+          <if>
+            <conditions match="all">
+              <condition position="subsequent"/>
+              <condition disambiguate="true"/>
+            </conditions>
+            <text font-variant="small-caps" text-case="title" variable="title-main" form="short"/>
           </if>
           <else-if>
             <conditions match="all">
@@ -764,7 +785,7 @@
               <condition variable="author composer" match="none"/>
               <condition variable="title-short" match="all"/>
             </conditions>
-            <text font-variant="small-caps" form="short" text-case="title" variable="title-short"/>
+            <text font-variant="small-caps" text-case="title" variable="title-main" form="short"/>
           </else-if>
           <else-if>
             <conditions match="any">
@@ -772,7 +793,7 @@
               <condition disambiguate="true" match="any"/>
               <condition variable="author composer" match="none"/>
             </conditions>
-            <text font-variant="small-caps" form="short" text-case="title" variable="title"/>
+            <text font-variant="small-caps" text-case="title" variable="title"/>
           </else-if>
         </choose>
       </else-if>
@@ -789,7 +810,7 @@
               <condition variable="author" match="none"/>
             </conditions>
             <group delimiter=" ">
-              <text font-style="italic" form="short" text-case="title" variable="title"/>
+              <text font-style="italic" text-case="title" variable="title"/>
               <names prefix="[" suffix="]" variable="composer">
                 <name form="short" initialize-with="."/>
               </names>
@@ -801,10 +822,13 @@
         <choose>
           <if>
             <conditions match="any">
-              <condition position="first" context="bibliography" disambiguate="true" match="any"/>
+              <condition position="first" context="bibliography" match="any"/>
             </conditions>
-            <text font-variant="small-caps" form="short" text-case="title" variable="title"/>
+            <text font-variant="small-caps" text-case="title" variable="title"/>
           </if>
+          <else-if disambiguate="true">
+            <text font-variant="small-caps" text-case="title" variable="title-main" form="short"/>
+          </else-if>
         </choose>
       </else-if>
       <else-if>
@@ -845,13 +869,15 @@
           <condition type="entry-dictionary"/>
         </conditions>
         <choose>
-          <if>
-            <conditions match="any">
-              <condition position="first" context="bibliography" disambiguate="true" match="any"/>
-              <condition variable="author container-author" match="none"/>
-            </conditions>
-            <text font-style="italic" form="short" text-case="title" variable="title"/>
+          <if position="first" context="bibliography" match="any">
+            <text font-style="italic" text-case="title" variable="title"/>
           </if>
+          <else-if variable="author container-author" match="none">
+            <text font-style="italic" text-case="title" variable="title-main" form="short"/>
+          </else-if>
+          <else-if disambiguate="true">
+            <text font-style="italic" text-case="title" variable="title-main" form="short"/>
+          </else-if>
         </choose>
       </else-if>
       <else-if>
@@ -930,7 +956,6 @@
           </group>
         </else>
       </choose>
-      <!-- date date-parts="year-month-day" form="text" prefix="(" suffix=")" variable="issued"/ -->
     </group>
   </macro>
   <macro name="us-issued-content">
@@ -983,6 +1008,11 @@
           <group delimiter=", ">
             <choose>
               <if match="none" type="thesis">
+                <choose>
+                  <if type="map">
+                    <text variable="publisher-place"/>
+                  </if>
+                </choose>
                 <group delimiter=", " subgroup-delimiter="; ">
                   <names variable="authority">
                     <name/>
@@ -1017,9 +1047,15 @@
   </macro>
   <macro name="us-issued-date">
     <choose>
-      <if type="post-weblog post webpage graphic paper-conference article-newspaper article-magazine interview personal_communication thesis broadcast video">
-        <date date-parts="year-month-day" form="text" variable="issued"/>
+      <if type="paper-conference">
+        <group delimiter=" ">
+          <text variable="event-place"/>
+          <date date-parts="year-month-day" form="text" variable="issued"/>
+        </group>
       </if>
+      <else-if type="post-weblog post webpage graphic article-newspaper article-magazine interview personal_communication thesis broadcast video" match="any">
+        <date date-parts="year-month-day" form="text" variable="issued"/>
+      </else-if>
       <else>
         <choose>
           <if variable="version">
@@ -1089,7 +1125,7 @@
             <condition type="legal_case" position="subsequent" variable="locator" match="all"/>
             <condition position="near-note" match="all"/>
           </conditions>
-          <text macro="std-locator-non-page-label-at"/>
+          <text macro="std-locator-non-page-label"/>
         </else-if>
         <else>
           <number variable="locator"/>
@@ -1702,8 +1738,10 @@
       <text form="short" variable="container-title"/>
       <choose>
         <if is-numeric="collection-number">
-          <number form="ordinal" variable="collection-number"/>
-          <text value="Sess."/>
+          <group delimiter=" ">
+            <number form="ordinal" variable="collection-number"/>
+            <text value="Sess."/>
+          </group>
         </if>
         <else>
           <number variable="collection-number"/>