diff --git a/bluebook-law-review.csl b/bluebook-law-review.csl
index 7074e859622..a000b11fda4 100644
--- a/bluebook-law-review.csl
+++ b/bluebook-law-review.csl
@@ -13,10 +13,13 @@
       <name>Nancy Sims</name>
       <email>nsims@umich.edu</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
     <summary>The Bluebook legal citation style for law reviews.</summary>
-    <updated>2018-12-04T16:38:55+00:00</updated>
+    <updated>2022-03-09T09:33:23+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -25,7 +28,6 @@
       <term name="translator" form="verb-short">trans.</term>
     </terms>
   </locale>
-  <!-- sets up basics of dealing with authors -->
   <macro name="name-macro">
     <names variable="author">
       <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
@@ -57,7 +59,7 @@
   <macro name="author">
     <choose>
       <if type="legal_case">
-        <text macro="name-macro" font-variant="normal"/>
+        <text macro="name-macro"/>
       </if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <text macro="name-macro" font-variant="small-caps"/>
@@ -67,53 +69,58 @@
       </else>
     </choose>
   </macro>
-  <!-- sets up basics of dealing with editors and translators. Will generally only show up in book citations, as called in XXXX, below -->
   <macro name="editor-translator">
-    <names variable="editor translator" suffix=" " delimiter=", ">
+    <names variable="editor translator" delimiter=", ">
       <name and="symbol" delimiter=", "/>
-      <label form="short" prefix=" " suffix=".," strip-periods="true"/>
+      <label form="short" strip-periods="false" prefix=" "/>
     </names>
   </macro>
-  <!-- link to online content, called in YYYYY -->
   <macro name="access">
     <choose>
       <if variable="URL">
-        <text variable="URL"/>
-        <group prefix=" (" suffix=")">
-          <text value="last visited" suffix=" "/>
-          <date variable="accessed">
-            <date-part name="month" form="short" suffix=" " strip-periods="true"/>
-            <date-part name="day" suffix=", "/>
-            <date-part name="year"/>
-          </date>
+        <group delimiter=" ">
+          <text variable="URL"/>
+          <group delimiter=" " prefix="(" suffix=")">
+            <text value="last visited"/>
+            <date variable="accessed">
+              <date-part name="month" form="short" suffix=" " strip-periods="true"/>
+              <date-part name="day" suffix=", "/>
+              <date-part name="year"/>
+            </date>
+          </group>
         </group>
       </if>
     </choose>
   </macro>
   <macro name="source">
-    <!-- This macro seems really problematic, with a ton of redundancy. I'd move some of
-    the conditional logic into the appropriate macros (like 'title') and try to remove this
-    macro entirely. -->
     <choose>
       <if type="article-journal" match="any">
-        <text variable="title" font-style="italic"/>
-        <group prefix=", " delimiter=" ">
-          <text variable="volume"/>
-          <text macro="container"/>
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <text variable="title" font-style="italic"/>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text macro="container"/>
+              <text variable="page"/>
+            </group>
+            <text variable="locator"/>
+          </group>
+          <text macro="issuance" prefix="(" suffix=")"/>
         </group>
-        <text variable="page" prefix=" "/>
-        <text variable="locator" prefix=", "/>
-        <text macro="issuance" prefix=" (" suffix=")"/>
       </if>
       <else-if type="legal_case">
-        <text variable="title" font-variant="normal"/>
-        <group prefix=", " delimiter=" ">
-          <text variable="volume"/>
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <text variable="volume"/>
+          </group>
           <text macro="container"/>
+          <group delimiter=", ">
+            <text variable="page"/>
+            <text variable="locator"/>
+          </group>
+          <text macro="issuance" prefix="(" suffix=")"/>
         </group>
-        <text variable="page" prefix=" "/>
-        <text variable="locator" prefix=", "/>
-        <text macro="issuance" prefix=" (" suffix=")"/>
       </else-if>
       <else-if type="article-newspaper article-magazine thesis" match="any">
         <group delimiter=", ">
@@ -146,14 +153,16 @@
         <text macro="issuance" prefix=" (" suffix=")"/>
       </else-if>
       <else>
-        <text variable="title" font-style="italic"/>
-        <group prefix=", " delimiter=" " suffix=" ">
-          <text variable="volume"/>
-          <text macro="container"/>
+        <group delimiter=", ">
+          <text variable="title" font-style="italic"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text macro="container"/>
+            <text variable="page"/>
+            <text variable="locator"/>
+            <text macro="issuance" prefix="(" suffix=")"/>
+          </group>
         </group>
-        <text variable="page" prefix=" "/>
-        <text variable="locator" prefix=" "/>
-        <text macro="issuance" prefix=" (" suffix=")"/>
       </else>
     </choose>
   </macro>
@@ -177,26 +186,27 @@
         </group>
       </if>
       <else>
-        <!-- removed an extra space in the prefix here NS 20110511 -->
-        <group delimiter=" ">
+        <group delimiter=", ">
           <text macro="editor-translator"/>
-          <text variable="edition" suffix=" ed."/>
-          <!-- replaced a text element with a missing variable reference -->
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <group delimiter=" ">
+            <group delimiter=" ">
+              <text variable="edition"/>
+              <label variable="edition" form="short"/>
+            </group>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </group>
         </group>
       </else>
     </choose>
   </macro>
-  <!-- sets up citing to specific page numbers for id and supra cites -->
   <macro name="at_page">
-    <group>
-      <text value="at" prefix=" "/>
-      <text variable="locator" prefix=" "/>
+    <group delimiter=" ">
+      <text value="at"/>
+      <text variable="locator"/>
     </group>
   </macro>
-  <!-- sets up the "in" in front of book sections, etc. -->
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
@@ -221,30 +231,39 @@
       <choose>
         <if position="ibid">
           <text value="id." text-case="capitalize-first" font-style="italic"/>
-          <text macro="at_page" suffix="."/>
-          <!-- period will not show up - this is for find-and-replace later. -->
+          <text macro="at_page"/>
         </if>
         <else-if position="subsequent">
-          <choose>
-            <if type="book" match="any">
-              <text variable="volume" suffix=" "/>
-            </if>
-          </choose>
-          <text macro="author-short"/>
-          <text value="supra" font-style="italic" prefix=", "/>
-          <text value="note" prefix=" "/>
-          <text variable="first-reference-note-number" prefix=" "/>
-          <text macro="at_page"/>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <choose>
+                <if type="book" match="any">
+                  <text variable="volume"/>
+                </if>
+              </choose>
+              <text macro="author-short"/>
+            </group>
+            <group delimiter=" ">
+              <text value="supra" font-style="italic"/>
+              <text value="note"/>
+              <text variable="first-reference-note-number"/>
+              <text macro="at_page"/>
+            </group>
+          </group>
         </else-if>
         <else>
-          <choose>
-            <if type="book" match="any">
-              <text variable="volume" suffix=" "/>
-            </if>
-          </choose>
-          <text macro="author" suffix=", "/>
-          <text macro="source"/>
-          <text macro="access" prefix=", "/>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <choose>
+                <if type="book" match="any">
+                  <text variable="volume"/>
+                </if>
+              </choose>
+              <text macro="author"/>
+            </group>
+            <text macro="source"/>
+            <text macro="access"/>
+          </group>
         </else>
       </choose>
     </layout>