diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index acb68706c3..db0d54dd78 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
     <title>American Psychological Association 6th edition (annotated bibliography with abstract)</title>
     <title-short>APA</title-short>
     <id>http://www.zotero.org/styles/apa-annotated-bibliography</id>
     <link href="http://www.zotero.org/styles/apa-annotated-bibliography" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
     <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
     <author>
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -24,15 +29,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <summary>APA style with abstract added as annotation in bibliography</summary>
-    <updated>2013-02-26T04:33:40+00:00</updated>
+    <updated>2016-09-28T13:09:49+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 xml:lang="en">
@@ -42,6 +42,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -49,341 +52,822 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -398,7 +882,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -409,7 +893,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -444,6 +938,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -466,21 +985,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -498,7 +1007,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -518,7 +1027,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -544,85 +1053,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -633,17 +1150,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -651,62 +1319,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -719,7 +1431,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -745,15 +1457,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -764,12 +1487,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
       <text variable="abstract" display="block"/>
     </layout>
diff --git a/apa-cv.csl b/apa-cv.csl
index 341886f1d7..e08e3db6ea 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
     <title>American Psychological Association 6th edition (curriculum vitae, sorted by descending date)</title>
     <title-short>APA</title-short>
     <id>http://www.zotero.org/styles/apa-cv</id>
     <link href="http://www.zotero.org/styles/apa-cv" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
     <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
     <author>
-      <name>Joseph Reagle</name>
-      <email>joseph.2011@reagle.org</email>
-    </author>
-    <contributor>
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
-    </contributor>
+    </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -28,15 +29,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <summary>APA style for CVs, in-line citations becomes references; redundant bibliography is sorted by date (descending), then title, then author</summary>
-    <updated>2018-05-14T04:33:40+00:00</updated>
+    <updated>2016-09-28T13:09:49+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 xml:lang="en">
@@ -46,6 +42,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -53,297 +52,713 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
-          <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
-            </if>
-          </choose>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
-              <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
                     <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
+            </if>
+            <else> 
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -358,7 +773,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -369,7 +784,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -406,7 +831,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -426,7 +851,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -452,93 +877,252 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+          </group>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
           </group>
         </group>
       </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
         </group>
       </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
       </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
     </choose>
   </macro>
-  <macro name="container">
+  <macro name="container-booklike">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -546,67 +1130,111 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
   </macro>
-  <citation et-al-min="8" et-al-use-first="6" et-al-use-last="true">
+  <citation et-al-min="8" et-al-use-first="6" et-al-use-last="true" disambiguate-add-year-suffix="true">
     <sort>
       <key macro="issued-sort" sort="descending"/>
       <key macro="author"/>
@@ -627,15 +1255,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -646,13 +1285,14 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
+      <text variable="annote" display="block"/>
     </layout>
   </citation>
   <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
@@ -676,15 +1316,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -695,13 +1346,14 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
+      <text variable="annote" display="block"/>
     </layout>
   </bibliography>
 </style>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 8d481857ac..2a2db6f144 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
     <title>American Psychological Association 6th edition (no ampersand)</title>
     <title-short>APA</title-short>
@@ -11,6 +11,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -25,14 +29,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2015-05-14T11:18:00+00:00</updated>
+    <updated>2016-09-28T13:09:49+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 xml:lang="en">
@@ -42,343 +42,832 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <locale xml:lang="es">
+    <terms>
+      <term name="from">de</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="text" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="text" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="text" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="text" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="text" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="text" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="text" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
             <name and="text" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="text" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="text" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="text" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="text" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="text" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="text" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="text" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="text" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="text" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -393,7 +882,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -404,7 +893,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -439,6 +938,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -461,21 +985,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -493,7 +1007,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -513,7 +1027,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -539,85 +1053,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -628,17 +1150,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="text" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -646,75 +1319,119 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
-      <key macro="author"/>
+      <key macro="author" names-min="8" names-use-first="6"/>
       <key macro="issued-sort"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -740,15 +1457,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -759,12 +1487,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 3d6b71e5b9..c6675ce6a6 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
     <title>American Psychological Association 6th edition (no DOIs, no issue numbers)</title>
     <title-short>APA</title-short>
@@ -10,6 +10,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -24,15 +28,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <summary>APA 6th edition, but without DOIs and issue numbers, as used in a number of journals like Organization Studies</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2016-09-28T13:09:49+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 xml:lang="en">
@@ -42,6 +41,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -49,342 +51,836 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
         <choose>
-          <if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
+          <if variable="page"/>
+          <else>
+            <text macro="online-access"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <choose>
+          <if variable="publisher page" match="any">
+            <text macro="publisher" suffix="."/>
           </if>
           <else>
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
+            <text macro="online-access"/>
           </else>
         </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="online-access">
+    <choose>
+      <if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
-      <else>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="page" match="none">
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if variable="DOI">
-                <text variable="DOI" prefix="doi:"/>
+              <if variable="archive-place" match="none">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <text term="from"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
+                </group>
               </if>
               <else>
-                <choose>
-                  <if type="webpage">
-                    <group delimiter=" ">
-                      <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                      <group>
-                        <date variable="accessed" form="text" suffix=", "/>
-                      </group>
-                      <text term="from"/>
-                      <text variable="URL"/>
-                    </group>
-                  </if>
-                  <else>
-                    <group>
-                      <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                      <text term="from" suffix=" "/>
-                      <text variable="URL"/>
-                    </group>
-                  </else>
-                </choose>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
           </if>
+          <else>
+            <text macro="publisher" suffix="."/>
+          </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
-          </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -399,7 +895,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -410,7 +906,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -445,6 +951,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -467,21 +998,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -499,7 +1020,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -519,7 +1040,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -545,84 +1066,100 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
+      <else-if type="article-magazine">
+        <group delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </else-if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -633,17 +1170,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -651,62 +1339,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -719,7 +1451,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -745,15 +1477,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -764,12 +1507,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index 35abd51341..28d3191202 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
     <title>American Psychological Association 6th edition ("doi:" DOI prefix)</title>
     <title-short>APA</title-short>
@@ -10,6 +10,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -24,14 +28,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2015-10-25T09:01:49+00:00</updated>
+    <updated>2016-09-28T13:09:49+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 xml:lang="en">
@@ -41,6 +41,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -48,341 +51,822 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="doi:/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="doi: "/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="doi:"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -397,7 +881,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -408,7 +892,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -443,6 +937,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -465,21 +984,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -497,7 +1006,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -517,7 +1026,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -543,85 +1052,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -632,17 +1149,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -650,62 +1318,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -718,7 +1430,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -744,15 +1456,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -763,12 +1486,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index cd8eb8dfcd..e6da6f581e 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
   <info>
     <title>American Psychological Association 6th edition (single-spaced bibliography)</title>
     <title-short>APA</title-short>
@@ -11,6 +11,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -25,14 +29,10 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2014-07-06T15:22:58+00:00</updated>
+    <updated>2016-09-28T13:09:49+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 xml:lang="en">
@@ -42,6 +42,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -49,341 +52,822 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -398,7 +882,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -409,7 +893,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -444,6 +938,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -466,21 +985,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -498,7 +1007,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -518,7 +1027,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -544,85 +1053,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -633,17 +1150,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -651,62 +1319,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -719,7 +1431,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -745,15 +1457,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -764,12 +1487,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/apa.csl b/apa.csl
index 1237709ecb..57ecdb3c37 100644
--- a/apa.csl
+++ b/apa.csl
@@ -10,6 +10,10 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
     </author>
+    <author>
+      <name> Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
     <contributor>
       <name>Bruce D'Arcus</name>
     </contributor>
@@ -24,10 +28,6 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
-    <contributor>
-      <name> Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
@@ -41,6 +41,9 @@
         <multiple>eds. &amp; trans.</multiple>
       </term>
       <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
     </terms>
   </locale>
   <locale xml:lang="es">
@@ -48,341 +51,822 @@
       <term name="from">de</term>
     </terms>
   </locale>
-  <macro name="container-contributors">
+  <macro name="container-contributors-booklike">
     <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=", ">
-          <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
+  <macro name="container-contributors">
     <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
-          <names variable="editor translator" delimiter=", ">
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <!-- Replace prefix with performer label as that becomes available -->
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
             <name and="symbol" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+      </else-if>
+      <else-if type="paper-conference">
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text macro="title"/>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
           </if>
           <else>
-            <text macro="title"/>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                    <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <choose>
       <if type="patent" variable="number" match="all">
         <text macro="patent-number"/>
       </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <!-- This should be localized -->
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+             <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
       <else>
-        <names variable="author">
+        <names variable="author" delimiter=", ">
           <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
           <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
             <names variable="editor"/>
+            <names variable="editorial-director"/>
             <names variable="translator"/>
             <choose>
-              <if type="report">
+              <if type="report" variable="publisher" match="all">
                 <text variable="publisher"/>
-                <text variable="title" form="short" font-style="italic"/>
               </if>
               <else-if type="legal_case">
                 <text variable="title" font-style="italic"/>
               </else-if>
-              <else-if type="book graphic  motion_picture song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </else-if>
               <else-if type="bill legislation" match="any">
                 <text variable="title" form="short"/>
               </else-if>
-              <else-if variable="reviewed-author">
-                <choose>
-                  <if variable="reviewed-title" match="none">
-                    <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-                  </if>
-                  <else>
-                    <text variable="title" form="short" quotes="true"/>
-                  </else>
-                </choose>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
-              <else>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
                 <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
               </else>
             </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
   <macro name="patent-number">
-    <!-- genre: U.S. Patent number: 123,445-->
+    <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
     <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <!-- This should be localized -->
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
       <group delimiter=" ">
-        <text variable="genre"/>
         <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
       </group>
-      <text variable="number"/>
     </group>
   </macro>
   <macro name="access">
     <choose>
-      <if type="thesis report" match="any">
-        <choose>
-          <if variable="DOI" match="any">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else-if variable="URL" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-          <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-      <else>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <text term="retrieved" text-case="capitalize-first"/>
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <text term="from"/>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <!-- This should be localized -->
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <!-- This should be localized -->
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
         <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
             <choose>
-              <if type="post post-weblog webpage" match="any">
+              <if variable="archive-place" match="none">
                 <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <group>
-                    <date variable="accessed" form="text" suffix=", "/>
-                  </group>
+                  <text term="retrieved" text-case="capitalize-first"/>
                   <text term="from"/>
-                  <text variable="URL"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
                 </group>
               </if>
               <else>
-                <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-                </group>
+                <text macro="publisher" suffix="."/>
               </else>
             </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
           </else>
         </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="book dataset graphic manuscript motion_picture report song speech thesis" match="any">
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
         <choose>
           <if variable="version" type="book" match="all">
-            <!---This is a hack until we have a computer program type -->
+            <!---This is a hack until we have a software type -->
             <text variable="title"/>
           </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="post post-weblog webpage" variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
           <else>
             <text variable="title" font-style="italic"/>
           </else>
         </choose>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA has four descriptive sections following the title: -->
+  <!-- (description), [format], container, event -->
+  <macro name="description">
+    <group prefix="(" suffix=")">
+      <choose>
+        <!-- book is here to catch software with container titles -->
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
               </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
             </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <!-- Assume `title` is title of reviewed work -->
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <!-- This should be localized -->
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
           </if>
           <else>
-            <!-- assume `title` is title of reviewed work -->
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name and="symbol" initialize-with=". " delimiter=", "/>
-              </names>
-            </group>
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="patent" variable="number" match="all">
-        <text macro="patent-number" font-style="italic"/>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <!-- This should be localized -->
+            <text value="Data set"/>
+          </else-if>
+        </choose>
       </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
+  <macro name="description-report">
     <choose>
-      <if type="report thesis" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+      <if variable="number">
+        <group delimiter="; ">
           <group delimiter=" ">
-            <choose>
-              <if variable="genre" match="any">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text variable="collection-title"/>
-              </else>
-            </choose>
-            <text variable="number" prefix="No. "/>
-          </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
+            <text variable="genre" text-case="title"/>
+            <!-- Replace with term="number" if that becomes available -->
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
           </group>
-          <text macro="edition"/>
+          <text macro="locators"/>
         </group>
       </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
+      <else>
+        <text macro="locators"/>
+      </else>
     </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
-  <macro name="format">
+  <macro name="format-report">
     <choose>
-      <if match="any" variable="medium">
+      <if variable="number">
         <text variable="medium" text-case="capitalize-first"/>
       </if>
-      <else-if type="dataset" match="any">
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
         <choose>
-          <if variable="genre">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if type="manuscript">
+            <text variable="genre"/>
           </if>
-          <else>
-            <!-- This should be localized -->
-            <text value="Data set"/>
-          </else>
         </choose>
-      </else-if>
-    </choose>
+        <group delimiter=" ">
+          <!-- Replace "archive" with "archive_collection" as that becomes available -->
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>         
+      </group>
+      <group delimiter=", ">
+        <!-- Move "archive" here when "archive_collection" becomes available -->
+        <text variable="archive-place"/>
+      </group>
+    </group>
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </if>
       <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
       <else-if type="patent">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <choose>
-            <if variable="publisher">
-              <text variable="publisher"/>
-            </if>
-            <else>
-              <text variable="authority"/>
-            </else>
-          </choose>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
           <choose>
-            <if variable="event version" type="speech dataset motion_picture" match="none">
-              <!-- Including version is to avoid printing the programming language for computerProgram /-->
-              <text variable="genre"/>
+            <if variable="event">
+              <choose>
+                <!-- Only print publisher info if published in a proceedings -->
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
             </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine article-newspaper" match="none">
+            <else> 
               <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
+                <text variable="publisher-place"/>
                 <text variable="publisher"/>
               </group>
-            </if>
+            </else>
           </choose>
+          <text macro="archive"/>
         </group>
       </else-if>
     </choose>
   </macro>
   <macro name="event">
     <choose>
-      <if variable="container-title" match="none">
+      <if variable="event" type="speech paper-conference" match="any">
         <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
+          <!-- Don't print event info if published in a proceedings -->
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
                   <text variable="event"/>
+                  <text variable="event-place"/>
                 </group>
-              </else>
-            </choose>
+              </group>
+            </group>
           </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
         </choose>
       </if>
     </choose>
@@ -397,7 +881,7 @@
           </date>
           <text variable="year-suffix"/>
           <choose>
-            <if type="speech" match="any">
+            <if type="speech">
               <date variable="issued" delimiter=" ">
                 <date-part prefix=", " name="month"/>
               </date>
@@ -408,7 +892,17 @@
                 <date-part prefix=" " name="day"/>
               </date>
             </else-if>
-            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference patent report review review-book song thesis -->
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+            <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
           </choose>
         </group>
       </else-if>
@@ -443,6 +937,31 @@
     </choose>
   </macro>
   <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -465,21 +984,11 @@
             <if is-uncertain-date="issued">
               <group prefix="[" suffix="]" delimiter=" ">
                 <text term="circa" form="short"/>
-                <group>
-                  <date variable="issued">
-                    <date-part name="year"/>
-                  </date>
-                  <text variable="year-suffix"/>
-                </group>
+                <text macro="issued-year"/>
               </group>
             </if>
             <else>
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-              </group>
+              <text macro="issued-year"/>
             </else>
           </choose>
         </group>
@@ -497,7 +1006,7 @@
   <macro name="original-date">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="speech" match="any">
+      <else-if type="speech">
         <date variable="original-date" delimiter=" ">
           <date-part name="month"/>
           <date-part name="year"/>
@@ -517,7 +1026,7 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="broadcast interview motion_picture song">
+      <else-if type="interview motion_picture song" match="any">
         <text value="Original work recorded"/>
       </else-if>
       <else-if type="broadcast">
@@ -543,85 +1052,93 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
           <group>
             <text variable="volume" font-style="italic"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
           <text variable="page"/>
         </group>
-        <choose>
-          <!--for advanced online publication-->
-          <if variable="issued">
-            <choose>
-              <if variable="page issue" match="none">
-                <text variable="status" text-case="capitalize-first" prefix=". "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
       </if>
       <else-if type="article-newspaper">
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <!-- edition for report is included in title-plus-extra /-->
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
               </group>
-            </if>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </else>
           </choose>
+        </if>
+        <else>
           <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <choose>
-            <if variable="container-title" match="any">
-              <!--Only print year for cases published in reporters-->
-              <date variable="issued" form="numeric" date-parts="year"/>
-            </if>
-            <else>
-              <date variable="issued" form="text"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
+        </else>
+      </choose>
+      <group>
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
   <macro name="citation-locator">
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first"/>
+          <label variable="locator" text-case="capitalize-first"/>
         </if>
         <else>
           <label variable="locator" form="short"/>
@@ -632,17 +1149,168 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="post-weblog webpage" match="none">
-        <group>
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-            </if>
-          </choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <!--for advance online publication-->
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <!--for advance online publication-->
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
             <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>     
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <!-- Replace with volume-title as that becomes available -->
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
           </group>
         </group>
       </if>
@@ -650,62 +1318,106 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="bill legal_case legislation" match="none">
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group prefix=", " delimiter=" ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <text variable="number" prefix="No. "/>
-            </else>
-          </choose>
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <!-- Replace with term="number" if that becomes available -->
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <!--Only print year for cases published in reporters-->
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
         </group>
       </if>
       <else-if type="bill legislation" match="any">
-        <group delimiter=", " prefix=", ">
-          <choose>
-            <if variable="number">
-              <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
-              <group delimiter=" ">
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <text variable="page-first"/>
-              </group>
-            </if>
-            <else>
-              <group delimiter=" ">
-                <text variable="volume"/>
-                <text variable="container-title"/>
-                <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-            </else>
-          </choose>
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <!--There's a public law number-->
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <!--change to label variable="section" as that becomes available -->
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -718,7 +1430,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -744,15 +1456,26 @@
               <text macro="issued" prefix=" (" suffix=")"/>
             </else>
           </choose>
-          <text macro="title-plus-extra"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
           <text macro="container"/>
         </group>
-        <text macro="legal-cites"/>
-        <text macro="locators"/>
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
+        <text macro="event" prefix=". "/>
       </group>
       <text macro="access" prefix=" "/>
       <choose>
@@ -763,12 +1486,12 @@
             <text macro="original-date"/>
           </group>
         </if>
-        <else>
+        <else-if variable="original-date">
           <group prefix=" (" suffix=")" delimiter=" ">
             <text macro="original-published"/>
             <text macro="original-date"/>
           </group>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>