diff --git a/csl/apsa.csl b/csl/apsa.csl
index 5069b3aa96..dae3329510 100644
--- a/csl/apsa.csl
+++ b/csl/apsa.csl
@@ -15,16 +15,16 @@
     <source>http://www.wisc.edu/writing/Handbook/DocAPSA.html</source>
   </info>
   <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
-      <name and="text" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
+    <names variable="editor" delimiter=", ">
+      <label form="short" text-case="lowercase" suffix=". "/>
+      <name and="text"  delimiter=", "/>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "
+      <name name-as-sort-order="first" and="text" sort-separator=", " 
 	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
       <substitute>
 	<names variable="editor"/>
 	<text variable="title"/>
@@ -42,10 +42,10 @@
     </names>
   </macro>
   <macro name="access">
-    <group>
-      <text value="Available at:" suffix=" "/>
+    <group delimiter=" ">
+      <text value="Available at:"/>
       <text variable="URL"/>
-      <group prefix=" [" suffix="]">
+      <group prefix="[" suffix="]">
 	<text term="accessed" text-case="capitalize-first" suffix=" "/>
 	<date variable="accessed">
 	  <date-part name="month" suffix=" "/>
@@ -113,29 +113,26 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <text macro="author"/>
+      <text macro="author" suffix="."/>
       <date variable="issued" prefix=" " suffix=".">
 	<date-part name="year"/>
       </date>
       <choose>
 	<if type="book">
-	  <group suffix=",">
-	    <text macro="title" prefix=" "/>
-	    <text variable="edition" prefix=" " suffix=" ed."/>
-	    <text macro="editor" prefix=" "/>
+	  <group prefix=" " delimiter=" ">
+	    <text macro="title" suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
 	  </group>
 	  <text prefix=" " suffix="." macro="publisher"/>
 	</if>
 	<else-if type="chapter">
 	  <text macro="title" prefix=" " suffix="." quotes="true"/>
-	  <group class="container" prefix=" ">
+	  <group class="container" prefix=" " delimiter=" ">
 	    <text term="in" text-case="capitalize-first"/>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <names variable="editor" prefix=", " suffix="." delimiter=", ">
-	      <label form="short" suffix=". " text-case="lowercase"/>
-	      <name and="text" sort-separator=", " initialize-with=". "/>
-	    </names>
+	    <text variable="container-title" font-style="italic" suffix=","/>
+	    <text variable="collection-title" suffix=","/>
+	    <text macro="editor" suffix="."/>
 	    <group suffix=".">
 	      <text macro="publisher" prefix=" "/>
 	      <group prefix=", ">
@@ -145,19 +142,17 @@
 	  </group>
 	</else-if>
 	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" " quotes="true"/>
-	    <text macro="editor" prefix=" "/>
+	  <group prefix=" " delimiter=" " suffix=".">
+	    <text macro="title" quotes="true"/>
+	    <text macro="editor" />
 	  </group>
 	  <group class="container" prefix=" " suffix=".">
 	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=", ">
+	    <group prefix=" ">
 	      <text variable="volume" />
 	      <text variable="issue" prefix="(" suffix=")"/>
 	    </group>
-	    <group prefix=":">
-	      <text variable="page"/>
-	    </group>
+	    <text variable="page" prefix=":"/>
 	  </group>
 	</else>
       </choose>