diff --git a/jm-mcgill-v9.csl b/jm-mcgill-v9.csl
index 55805a3..dc14c49 100644
--- a/jm-mcgill-v9.csl
+++ b/jm-mcgill-v9.csl
@@ -28,9 +28,13 @@
       <email>gspanglett@gmail.com</email>
       <uri>https://gspanglett.github.io</uri>
     </contributor>
+    <contributor>
+      <name>Peter Wills</name>
+      <email>peter.wills@law.ox.ac.uk</email>
+    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2022-03-09T22:53:52+00:00</updated>
+    <updated>2022-12-06 15:37:58</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 xml:lang="fr">
@@ -122,7 +126,8 @@
       <term name="in" form="short">in</term>
       <term name="in" form="verb">reprinted in</term>
       <term name="in" form="symbol">:</term>
-      <term name="online" form="short">en ligne (blog)</term>
+									   
+      <term name="online" form="short">online (blog)</term>
       <term name="and" form="symbol">&#38;</term>
       <term name="et-al">et al</term>
       <term name="from" form="verb">to the</term>
@@ -203,7 +208,7 @@
           <else>
             <group delimiter=" ">
               <text term="ibid" text-case="capitalize-first" font-style="italic" strip-periods="true"/>
-              <text macro="juris-locator" label-form="short"/>
+              <text macro="pinpoint"/>
             </group>
           </else>
         </choose>
@@ -215,7 +220,7 @@
         <!-- short form -->
         <group delimiter=" ">
           <group delimiter=", ">
-            <text macro="juris-title-short" font-style="italic" strip-periods="true"/>
+            <text macro="local-title-short" font-style="italic" strip-periods="true" suffix=","/>
             <text value="supra" font-style="italic"/>
           </group>
           <choose>
@@ -227,7 +232,7 @@
             </if>
             <else>
               <text variable="first-reference-note-number" prefix="note "/>            
-              <text macro="juris-locator" label-form="short" strip-periods="true"/>
+              <text macro="pinpoint"/>
             </else>
           </choose>
         </group>
@@ -316,7 +321,7 @@
                     </group>
                     <group delimiter=", ">
                       <group delimiter=" ">
-                        <text macro="juris-main"/>
+                        <text macro="juris-main" strip-periods="true"/>
                         <text macro="juris-locator" label-form="short" strip-periods="true"/>
                       </group>
                       <choose>
@@ -330,6 +335,37 @@
                       </choose>
                     </group>
                   </group>
+                  <choose>
+                    <!-- Replicating juris-ca hierarchy -->
+                    <if> <!-- Reporter without year as volume-->
+                      <conditions match="all">
+                        <condition match="all" variable="container-title volume"/>
+                        <condition match="none" variable="collection-number admin-flag"/>
+                      </conditions>
+                      <text macro="ct-jurisdiction-paren" />
+                    </if>
+                    <else-if> <!-- online service-->
+                      <conditions match="all">
+                        <condition match="all" variable="submitted container-title"/>
+                        <condition match="none" variable="collection-number admin-flag"/>
+                      </conditions>
+                      <text macro="ct-jurisdiction-paren" />
+                    </else-if>
+                    <else-if> <!-- Reporter with [year] and page -->
+                      <conditions match="all">
+                        <condition match="all" variable="collection-number container-title page"/>
+                        <condition match="none" variable="admin-flag"/>
+                      </conditions>
+                      <text macro="ct-jurisdiction-paren" />
+                    </else-if>
+                    <else-if> <!-- Journal with [year] and no page -->
+                      <conditions match="all">
+                        <condition match="all" variable="collection-number container-title issue"/>
+                        <condition match="none" variable="admin-flag"/>
+                      </conditions>
+                      <text macro="ct-jurisdiction-paren" />
+                    </else-if>
+                  </choose>
                   <choose>
                     <if>
                       <conditions match="all">
@@ -623,7 +659,7 @@
                         <condition position="first"/>
                       </conditions>
                       <group parallel-last="title-short title">
-                        <text macro="juris-title-short" prefix="[" suffix="]" font-style="italic"/>
+                        <text macro="local-title-short" prefix="[" suffix="]" font-style="italic"/>
                       </group>
                     </if>
                   </choose>
@@ -792,6 +828,12 @@
                   <else-if type="entry-encyclopedia">
                     <text macro="render-entry-encyclopedia"/>
                   </else-if>
+                  <else-if type="paper-conference">
+                    <text macro="render-paper-conference"/>
+                  </else-if>
+                  <else-if variable="genre">
+                    <text macro="render-article-preprint"/>
+                  </else-if>
                   <else-if type="article">
                     <text macro="render-article"/>
                   </else-if>
@@ -815,6 +857,9 @@
             <if variable="hereinafter">
               <text variable="hereinafter" prefix="[" suffix="]" font-style="italic"/>
             </if>
+            <if type="book article-journal chapter article-newspaper post-weblog" variable="author">
+              <!-- Don't show the short title if there's an author that'll be shown instead-->
+            </if>
             <else-if variable="title-short">
               <text variable="title-short" prefix="[" suffix="]" font-style="italic"/>
             </else-if>
@@ -903,6 +948,12 @@
             <else-if type="entry-encyclopedia">
               <text macro="render-entry-encyclopedia"/>
             </else-if>
+            <else-if type="paper-conference">
+              <text macro="render-paper-conference"/>
+            </else-if>
+            <else-if variable="genre">
+              <text macro="render-article-preprint"/>
+            </else-if>
             <else-if type="article">
               <text macro="render-article"/>
             </else-if>
@@ -1047,14 +1098,14 @@
   <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
     right. Only actually need to check for 'first' because w/i cite all the other tests should have been done... -->
   <macro name="render-chapter">
-    <group delimiter=", ">
-      <group delimiter=" ">
-        <text variable="title" quotes="true"/>
-        <text term="in" form="short"/>
-        <text macro="editor" strip-periods="true"/>
+    <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <text term="in" form="short"/>
+      <text macro="editor" strip-periods="true" suffix=", "/> <!-- if there's no editor, no comma-->
+      <group delimiter=", ">
+        <text macro="container-title" font-style="italic"/>
+        <text macro="edition"/>
       </group>
-      <text macro="container-title" font-style="italic"/>
-      <text macro="edition"/>
     </group>
     <group delimiter=", ">
       <text macro="publisher-place-year"/>
@@ -1177,7 +1228,36 @@
       <number variable="page-first"/>
     </group>
   </macro>
-  <macro name="render-article">
+  <macro name="render-paper-conference">
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix=""/>
+      <group delimiter=", ">
+        <group delimiter=", " prefix="(" suffix=")">
+          <text variable="event-title" prefix="Paper delivered at "/>
+          <text variable="event-place"/>
+          <text macro="issued-long"/>
+        </group>
+        <group delimiter=" ">
+          <group delimiter=":">
+            <number variable="volume"/>
+            <number variable="issue"/>
+          </group>
+          <text variable="publisher"/>
+          <text variable="collection-title" prefix="(" suffix=")"/>
+          <number variable="page-first"/>
+        </group>
+      </group>
+	  </group>
+  </macro>
+  <macro name="render-article-preprint">
+	  <group delimiter=" ">
+      <text variable="title" quotes="true"/>
+      <date form="text" variable="issued" date-parts="year" prefix="(" suffix=")"/>
+      <text variable="genre"/>
+      <text variable="collection-number" prefix="Working Paper "/>
+      <number variable="page-first"/>
+    </group>
+  </macro>  <macro name="render-article">
     <group delimiter=", ">
       <group delimiter=" ">
         <group>
@@ -1216,8 +1296,10 @@
       <group delimiter=" ">
         <choose>
           <if type="post-weblog">
-            <text term="online" form="short"/>
-            <text term="in" form="symbol"/>
+            <group>
+              <text term="online" form="short"/>
+              <text term="in" form="symbol"/>
+            </group>
           </if>
           <else>
             <group>
@@ -1458,7 +1540,7 @@
       <if variable="hereinafter">
         <text variable="hereinafter" font-style="italic"/>
       </if>
-      <else-if type="book article-journal chapter article-newspaper post-weblog">
+      <else-if type="book article-journal chapter article-newspaper post-weblog paper-conference">
         <names variable="author">
           <name and="symbol" form="short" delimiter-precedes-last="never"/>
           <substitute>
@@ -1477,9 +1559,9 @@
     </choose>
   </macro>
   <macro name="publisher-place-year">
+  	<text term="open-quote" form="short"/>									  
     <group delimiter=" ">
       <group>
-        <text term="open-quote" form="short"/>
         <text variable="publisher-place"/>
         <text term="open-inner-quote" form="short"/>
       </group>
@@ -1512,6 +1594,40 @@
       </group>
     </group>
   </macro>
+  <macro name="ct-jurisdiction-paren">
+    <names variable="authority" prefix="(" suffix=")">
+      <name/>
+      <institution institution-parts="short"/>
+    </names>
+  </macro>
+  <macro name="local-title-short">
+    <!-- The title form for subsequent citations (of all types) -->
+    <choose>
+      <if position="first">
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="hereinafter">
+            <text variable="hereinafter"/>
+          </if>
+          <else-if variable="title-short">
+            <text variable="title-short"/>
+          </else-if>
+          <else>
+            <text variable="title"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
   <citation et-al-min="4" et-al-use-first="1">
     <!-- translator needs to be added for chapter book film etc. chapter? -->
     <layout delimiter="; " suffix=".">