diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index 225a88c56..db654fa44 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -12,21 +12,25 @@
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email> 
     </contributor>
+    <contributor>
+      <name>Elena Razlogova</name>
+      <email>elena.razlogova@gmail.com</email> 
+    </contributor>
     <summary>Chicago format with short notes and full bibliography</summary>
     <category term="generic-base"/>
     <category term="numeric"/>
     <updated/>
   </info>
   <macro name="editor-translator">
-    <names variable="editor translator" prefix="" suffix="" delimiter=", ">
-      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+    <names variable="editor translator" delimiter=". ">
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
   <macro name="editor-translator-short">
     <choose>
       <if variable="author">
-	<names variable="editor translator" prefix="" suffix="" delimiter=", ">
+	<names variable="editor translator" delimiter=", ">
 	  <label form="short" prefix=" " text-case="lowercase" suffix=". "/>
 	  <name and="text" delimiter=", "/>
 	</names>
@@ -41,7 +45,6 @@
       <substitute>
 	<names variable="editor"/>
 	<names variable="translator"/>
-	<text macro="title"/>
       </substitute>
     </names>
   </macro> 
@@ -53,7 +56,6 @@
       <substitute>
 	<names variable="editor"/>
 	<names variable="translator"/>
-	<text macro="title"/>
       </substitute>
     </names>
   </macro>
@@ -64,17 +66,27 @@
       <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="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
   <macro name="access">
     <group>
       <text variable="URL"/>
@@ -90,14 +102,21 @@
   </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>
@@ -107,6 +126,28 @@
       <text variable="publisher"/>
     </group>
   </macro>
+  <macro name="archive">
+    <group delimiter=", ">
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="date-main">
+    <choose>
+      <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"/>
@@ -116,44 +157,22 @@
     <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 type="thesis">
-	    <group prefix=" (" delimiter=", " suffix=")">
-	      <text variable="genre"/>
-	    </group>
-	  </if>
-	  <else-if type="chapter book" match="any">
-	    <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"/>
-	  </else-if>
-	  <else-if type="article-journal">
-	    <group class="container" prefix=" ">
-	      <text variable="container-title" font-style="italic" prefix=" "/>
-	      <text macro="publisher"/>
-	      <text variable="volume"  prefix=" "/>
-	      <text variable="issue" prefix=", no. "/>
-	      <date variable="issued" prefix=" (" suffix=")">
-		<date-part name="year"/>
-	      </date>
-	      <text variable="page" prefix=": "/>
-	    </group>
-	  </else-if>
-	  <else>
-	    <group delimiter=", " prefix=". ">
-	      <text variable="container-title" font-style="italic"/>
-	      <text variable="issue"  prefix=", " suffix="."/>
-	    </group>
-	  </else>
-	</choose>
-	<text variable="locator" prefix=", "/>
-      </group> 
+      <group delimiter=", ">
+        <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>
     </layout>
   </citation> 
   <bibliography>
@@ -162,115 +181,112 @@
     <option name="et-al-use-first" value="6"/>
     <option name="subsequent-author-substitute" value="---"/>
     <layout suffix=".">
-      <text macro="author" suffix="."/>
+	  <group delimiter=". ">
+      <text macro="author"/>
+	  <text macro="title"/>
       <choose>
 	<if type="thesis">
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	  </group>
-	  <group delimiter=", " prefix=" ">
+	  <group delimiter=", ">
 	    <text variable="genre"/>
 	    <text variable="publisher"/>
-	    <date variable="issued">
-	      <date-part name="year"/>
-	    </date>
+	    <text macro="date-main"/>
 	  </group>
 	</if>
 	<else-if type="chapter">
-	  <text macro="title" prefix=" "/>
-	  <group class="container" prefix=". ">
+	  <group class="container">
 	    <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 translator" prefix=" " suffix="," delimiter=", ">
-	      <label form="verb" text-case="lowercase" suffix=" "/>
-	      <name and="text" sort-separator=", " />
-	    </names>
-	    <group suffix=".">
-	      <text variable="page" prefix=" "/>
-	    </group>
-	    <group>
-	      <text macro="publisher" prefix=" "/>
-	      <date variable="issued" prefix=", ">
-		<date-part name="year"/>
-	      </date>
-	    </group>
+	    <text variable="container-title" font-style="italic" prefix=" "/>
+	    <text variable="collection-title" prefix=". "/>
+	    <text macro="editor-translator" prefix=". "/>
+	    <text variable="page" prefix=", "/>
+	    <text macro="publisher" prefix=". "/>
+	    <text macro="date-main" prefix=", "/>
 	  </group>
 	</else-if>
 	<else-if type="article-journal">
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor-translator" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="">
-	    <text variable="container-title" font-style="italic" prefix=" "/>
+	  <text macro="editor-translator" suffix=". "/>
+	  <group class="container">
+	    <text variable="container-title" font-style="italic"/>
 	    <text variable="volume"  prefix=" "/>
 	    <text variable="issue" prefix=", no. "/>
-	    <date variable="issued" prefix=" (" suffix=")">
-	      <date-part name="month" suffix=" "/>
-	      <date-part name="day" suffix=", "/>
-	      <date-part name="year"/>
-	    </date>
+	    <text macro="date-main" prefix=" (" suffix=")"/>
 	    <text variable="page" prefix=": "/>
 	  </group>
 	</else-if>
 	<else-if type="article-newspaper article-magazine" match="any">
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor-translator" prefix=" "/>
-	  </group>
-	  <group delimiter=", " prefix=" ">
+	  <text macro="editor-translator" suffix=". "/>
+	  <group delimiter=", ">
 	    <text variable="container-title" font-style="italic"/>
-	    <text variable="issue"  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">
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor-translator" prefix=" "/>
-	  </group>
-	  <group suffix="">
-	    <text value="paper presented at" text-case="capitalize-first"/>
-	    <text variable="event" prefix=" "/>
-	    <text variable="event-place"  prefix=", "/>
-	    <date variable="event">
-	      <date-part name="month" form="long"/>
-	      <date-part name="day" form="numeric" prefix=" " suffix=", "/>
-	      <date-part name="year"/>
-	    </date>          
+	  <text macro="editor-translator" suffix=". "/>
+	  <text variable="genre" text-case="capitalize-first" suffix=" presented at the "/>
+	  <text variable="event" prefix=" " suffix=", "/>
+	  <text variable="event-place" suffix=", "/>
+	  <text macro="date-main"/>
+	</else-if>
+	<else-if type="interview">
+	  <group delimiter=". " suffix=".">
+	    <text macro="interviewer"/>
+	    <text variable="medium" text-case="capitalize-first"/>
+	    <text macro="date-main"/>
 	  </group>
 	</else-if>
+	<else-if type="personal_communication">
+	  <choose>
+	    <if variable="genre">
+	  <text variable="genre" text-case="capitalize-first"/>
+	    </if>
+	    <else>
+	  <text term="letter" text-case="capitalize-first"/>
+	    </else>
+	  </choose>
+	  <text macro="recipient" prefix=" "/>
+	  <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>
+	</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>
+	</else-if>
 	<else-if type="book">
-	  <group suffix=".">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text macro="editor-translator" prefix=""/>
-	  </group>
-	  <text prefix=" " suffix="," macro="publisher"/>
-	  <date variable="issued" prefix=" " suffix="">
-	    <date-part name="year"/>
-	  </date>
+	  <text macro="editor-translator" suffix=". "/>
+	  <text variable="collection-title" suffix=". "/>
+	  <text macro="publisher" suffix=", "/>
+	  <text macro="date-main"/>
 	</else-if>
 	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor-translator" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="">
+	  <group class="container" delimiter=". ">
+	    <text macro="editor-translator"/>
 	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=", ">
-	      <text variable="volume" font-style="italic"/>
-	      <text variable="issue" prefix="(" suffix=")"/>
-	    </group>
-	    <text variable="page" prefix=", "/>
+	    <text variable="collection-title" font-style="italic"/>
+	    <text variable="genre" text-case="capitalize-first"/>
+	    <text variable="medium" text-case="capitalize-first"/>
+	    <text macro="date-main"/>
 	  </group>
 	</else>
       </choose>
-      <text prefix=" " macro="access"/>
+	  <text variable="archive_location" text-case="title"/>
+	  <text macro="archive"/>
+      <text macro="access"/>
+	  </group>
     </layout>
   </bibliography>
 </style>