diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index db654fa44..1508eef7b 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -134,6 +134,13 @@
   </macro>
   <macro name="date-main">
     <choose>
+      <if type="graphic report" match="any">
+    <date variable="issued">
+      <date-part name="month" suffix=" "/>
+	  <date-part name="day" suffix=", "/>
+	  <date-part name="year"/>
+    </date>
+      </if>
       <if type="book chapter thesis" match="any">
     <date variable="issued">
 	  <date-part name="year"/>
@@ -223,7 +230,7 @@
 	<else-if type="paper-conference">
 	  <text macro="editor-translator" suffix=". "/>
 	  <text variable="genre" text-case="capitalize-first" suffix=" presented at the "/>
-	  <text variable="event" prefix=" " suffix=", "/>
+	  <text variable="event" suffix=", "/>
 	  <text variable="event-place" suffix=", "/>
 	  <text macro="date-main"/>
 	</else-if>
@@ -247,24 +254,15 @@
 	  <text macro="date-main" prefix=". "/>
 	</else-if>
 	<else-if type="graphic">
-	  <text macro="editor-translator" suffix=". "/>
 	  <text variable="medium" text-case="capitalize-first" suffix=". "/>
 	  <text macro="publisher" suffix=", "/>
-      <date variable="issued">
-        <date-part name="month" suffix=" "/>
-	    <date-part name="day" suffix=", "/>
-	    <date-part name="year"/>
-      </date>
+	  <text macro="date-main"/>
 	</else-if>
 	<else-if type="report">
 	  <text macro="editor-translator" suffix=". "/>
 	  <text variable="genre" suffix=". "/>
 	  <text macro="publisher" suffix=", "/>
-      <date variable="issued">
-        <date-part name="month" suffix=" "/>
-	    <date-part name="day" suffix=", "/>
-	    <date-part name="year"/>
-      </date>
+	   <text macro="date-main"/>
 	</else-if>
 	<else-if type="book">
 	  <text macro="editor-translator" suffix=". "/>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
index 2ac487b1c..a24549c48 100644
--- a/csl/chicago-note.csl
+++ b/csl/chicago-note.csl
@@ -35,46 +35,54 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="first" and="text" sort-separator=", "
+      <name and="text" sort-separator=", "
 	    delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=", " suffix="."/>
       <substitute>
 	<names variable="editor"/>
 	<names variable="translator"/>
-	<text macro="title"/>
       </substitute>
     </names>
   </macro> 
   <macro name="author-full">
     <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", "
+      <name and="text" sort-separator=", "
 	    delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=", " suffix="."/>
       <substitute>
 	<names variable="editor"/>
 	<names variable="translator"/>
-	<text macro="title"/>
       </substitute>
     </names>
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="long" and="text" delimiter=", " />
+      <name form="short" and="text" delimiter=", " />
       <label form="short" prefix=", " suffix="."/>
       <substitute>
 	<names variable="editor"/>
 	<names variable="translator"/>
-	<choose>
-	  <if type="book">
-	    <text variable="title" form="short" font-style="italic"/>
-	  </if>
-	  <else>
-	    <text variable="title" form="short" quotes="true"/>
-	  </else>
-	</choose>
       </substitute>
     </names>
   </macro>
+  <macro name="recipient">
+    <names variable="recipient" prefix="" suffix="" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient"> 
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name form="short" and="text" delimiter=", " />
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" prefix="" suffix="" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
   <macro name="access">
     <group>
       <text variable="URL"/>
@@ -90,24 +98,64 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="thesis">
-	<text variable="title" form="short" quotes="true"/>
+      <if type="book">
+	<text variable="title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="book">
-	<text variable="title" form="short" font-style="italic"/>
-      </else-if>
       <else>
-	<text variable="title" form="short" quotes="true"/>
+	<text variable="title" quotes="true" text-case="title"/>
       </else>
     </choose>
   </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="book">
+	<text variable="title" form="short" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+	<text variable="title" form="short" quotes="true" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event"> 
+    <text variable="event"/> 
+    <text variable="event-place" prefix=", "/> 
+  </macro> 
   <macro name="publisher">
     <group delimiter=": ">
       <text variable="publisher-place"/>
       <text variable="publisher"/>
     </group>
   </macro>
-  <citation>
+    <macro name="archive">
+    <group delimiter=", ">
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="date-main">
+    <choose>
+      <if type="graphic report" match="any">
+    <date variable="issued">
+      <date-part name="month" suffix=" "/>
+	  <date-part name="day" suffix=", "/>
+	  <date-part name="year"/>
+    </date>
+      </if>
+      <if type="book chapter thesis" match="any">
+    <date variable="issued">
+	  <date-part name="year"/>
+    </date>
+      </if>
+      <else>
+    <date variable="issued">
+      <date-part name="month" suffix=" "/>
+	  <date-part name="day" suffix=", "/>
+	  <date-part name="year"/>
+    </date>
+      </else>
+    </choose>
+  </macro>
+<citation>
     <option name="et-al-min" value="4"/>
     <option name="et-al-use-first" value="1"/>
     <option name="et-al-subsequent-min" value="4"/>
@@ -116,59 +164,143 @@
     <option name="disambiguate-add-names" value="true"/>
     <option name="disambiguate-add-givenname" value="true"/>
     <layout prefix="" suffix="." delimiter="; ">
-      <group suffix="">       
-	<text macro="author-short" suffix=", "/>
-	<text macro="title" prefix=""/>
+	<choose>
+  <if position="subsequent">
+    <group delimiter=", " ibid="true">
+      <group>
+	<text macro="author-short"/>      
+	<text macro="recipient-short"/>
+      </group>
+	<text macro="title-short"/>
+      <choose>
+	<if type="interview">
+	  <text term="interview" text-case="lowercase"/>
+	</if>
+	<else-if  variable="recipient">
+	  <text macro="date-main"/>
+	</else-if>
+      </choose>
+	<text variable="locator"/>
+    </group>
+  </if> 
+  <else>
+    <group delimiter=", ">
+      <group>
+	<text macro="author"/>      
+	<text macro="recipient"/>
+	  </group>
+	<text macro="title"/>
+	</group>
 	<choose>
 	  <if type="thesis">
 	    <group prefix=" (" delimiter=", " suffix=")">
 	      <text variable="genre"/>
 	      <text variable="publisher"/>
-	      <date variable="issued">
-		<date-part name="year"/>
-	      </date>
+	      <text macro="date-main"/>
 	    </group>
 	  </if>
-	  <else-if type="chapter book" match="any">
-	    <group class="container" prefix=". ">
+	  <else-if type="chapter">
+	    <group class="container" prefix=", ">
 	      <text term="in" text-case="lowercase"/>
 	      <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-	      <text variable="collection-title" prefix=" " suffix=","/>
 	    </group>
-	    <text macro="editor-translator-short"/>
+	    <text macro="editor-translator"/>
 	    <group prefix=" (" suffix=")" delimiter=", ">
 	      <text macro="publisher"/>
-	      <date variable="issued">
-		<date-part name="year"/>
-	      </date>
+	      <text macro="date-main"/>
 	    </group>
 	  </else-if>
 	  <else-if type="article-journal">
-	    <group class="container" prefix=" ">
+	    <group class="container" prefix=", ">
 	      <text variable="container-title" font-style="italic" prefix=" "/>
 	      <text macro="publisher"/>
-	      <text variable="volume"  prefix=" "/>
+	      <text variable="volume" prefix=" "/>
 	      <text variable="issue" prefix=", no. "/>
-	      <date variable="issued" prefix=" (" suffix=")">
-		<date-part name="year"/>
-	      </date>
-	      <text variable="page" prefix=": "/>
+	      <text macro="date-main" prefix=" (" suffix=")"/>
 	    </group>
 	  </else-if>
-	  <else>
-	    <group delimiter=", " prefix=". ">
+	  <else-if type="article-newspaper article-magazine" match="any">
+	    <group prefix=", " delimiter=", ">
+	      <text macro="editor-translator"/>
 	      <text variable="container-title" font-style="italic"/>
-	      <text variable="issue"  prefix=", " suffix="."/>
-	      <date variable="issued">
-		<date-part name="month" form="long"/>
-		<date-part name="day" form="numeric" prefix=" " suffix=", "/>
-		<date-part name="year"/>
-	      </date>          
+	      <text macro="date-main"/>
+	    </group>
+	  </else-if>
+	<else-if type="paper-conference">
+	  <text macro="editor-translator" prefix=", "/>
+	  <text variable="genre" prefix=", " suffix=" presented at the "/>
+	  <text macro="event" suffix=", "/>
+	  <text macro="date-main"/>
+	</else-if>
+	<else-if type="interview">
+	  <group prefix=", " delimiter=", ">
+	    <text macro="interviewer"/>
+	    <text variable="medium"/>
+	    <text macro="date-main"/>
+	  </group>
+	</else-if>
+	<else-if type="personal_communication">
+	  <group prefix=", " delimiter=", ">
+	    <text variable="genre"/>
+	    <text macro="date-main"/>
+	  </group>
+	</else-if>
+	<else-if type="graphic">
+	  <group prefix=", " delimiter=", ">
+	    <text variable="medium"/>
+	    <text macro="publisher"/>
+	    <text macro="date-main"/>
+	  </group>
+	</else-if>
+	<else-if type="report">
+	  <text macro="editor-translator" prefix=", "/>
+	  <text variable="genre" prefix=", "/>
+	  <choose>
+	    <if variable="publisher publisher-place" match="all">
+	    <group prefix=" (" suffix=")" delimiter=", ">
+	  <text macro="publisher"/>
+	  <text macro="date-main"/>
+	    </group>
+	    </if>
+	    <else>
+	  <text macro="date-main" prefix=", "/>
+	    </else>
+	  </choose>
+	</else-if>
+	<else-if type="book">
+	  <text macro="editor-translator" prefix=", "/>
+	  <text variable="collection-title" prefix=", "/>
+	    <group prefix=" (" suffix=")" delimiter=", ">
+	  <text macro="publisher"/>
+	  <text macro="date-main"/>
+	    </group>
+	</else-if>
+	  <else>
+	    <group class="container"  prefix=", " delimiter=", ">
+	  <text macro="editor-translator"/>
+	  <text variable="container-title" font-style="italic"/>
+	  <text variable="collection-title" font-style="italic"/>
+	  <text variable="genre"/>
+	  <text variable="medium"/>
+	  <text macro="date-main"/>
 	    </group>
 	  </else>
 	</choose>
+	<choose>
+	  <if type="article-journal">
+	<text variable="locator" prefix=": "/>
+	  </if>
+	  <else>
 	<text variable="locator" prefix=", "/>
-      </group> 
+	  </else>
+	</choose>
+	<group prefix=", " delimiter=", ">
+	  <text variable="archive_location"/>
+	  <text macro="archive"/>
+      <text macro="access"/>
+	</group>
+	  </else>
+	</choose>
     </layout>
   </citation> 
 </style>