diff --git a/examples/article.html b/examples/article.html
index e592d83..60264e2 100644
--- a/examples/article.html
+++ b/examples/article.html
@@ -78,7 +78,7 @@
   <a class="marker" href="#section-1.1" id="section-1.1"><span>1.1</span></a>
   <h3>Citations</h3>
   <p><d-slider style="width: 200px;"></d-slider></p>
-  <p>We can<d-cite key="mercier2011humans"></d-cite> also cite <d-cite key="gregor2015draw,mercier2011humans"></d-cite> external publications. <d-cite key="dong2014image,dumoulin2016guide,mordvintsev2015inceptionism"></d-cite>. We should also be testing footnotes<d-footnote>This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote.</d-footnote>. There are multiple footnotes, and they appear in the appendix<d-footnote>Given I have coded them right. Also, here's math in a footnote: <d-math>c = \sum_0^i{x}</d-math>. Also, a citation. Box-ception<d-cite key='gregor2015draw'></d-cite>!</d-footnote> as well.</p>
+  <p>We can<d-cite key="mercier2011humans"></d-cite> also cite <d-cite key="gregor2015draw,mercier2011humans,openai2018charter"></d-cite> external publications. <d-cite key="dong2014image,dumoulin2016guide,mordvintsev2015inceptionism"></d-cite>. We should also be testing footnotes<d-footnote>This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote.</d-footnote>. There are multiple footnotes, and they appear in the appendix<d-footnote>Given I have coded them right. Also, here's math in a footnote: <d-math>c = \sum_0^i{x}</d-math>. Also, a citation. Box-ception<d-cite key='gregor2015draw'></d-cite>!</d-footnote> as well.</p>
   <a class="marker" href="#section-2" id="section-2"><span>2</span></a>
   <h2>Displaying code snippets</h2>
   <p>Some inline javascript:<d-code language="javascript">var x = 25;</d-code>. And here's a javascript code block.</p>
diff --git a/examples/bibliography.bib b/examples/bibliography.bib
index 1508c51..644e10e 100644
--- a/examples/bibliography.bib
+++ b/examples/bibliography.bib
@@ -97,3 +97,12 @@
   year={2016},
   url={https://arxiv.org/pdf/1609.07009.pdf}
 }
+
+@misc{openai2018charter,
+  author={OpenAI},
+  title={OpenAI Charter},
+  type={Blog},
+  number={April 9},
+  year={2018},
+  url={https://blog.openai.com/charter},
+}
diff --git a/src/front-matter.js b/src/front-matter.js
index 2a22c6b..ccedc31 100644
--- a/src/front-matter.js
+++ b/src/front-matter.js
@@ -96,7 +96,9 @@ export function mergeFromYMLFrontmatter(target, source) {
   target.authors = source.authors.map( (authorObject) => new Author(authorObject));
   target.katex = source.katex;
   target.password = source.password;
-  target.doi = source.doi;
+  if (source.doi) {
+    target.doi = source.doi;
+  }
 }
 
 export class FrontMatter {
@@ -161,6 +163,7 @@ export class FrontMatter {
     //  githubCompareUpdatesUrl: 'https://github.com/distillpub/post--augmented-rnns/compare/1596e094d8943d2dc0ea445d92071129c6419c59...3bd9209e0c24d020f87cf6152dcecc6017cbc193',
     //  updatedDate: 2017-03-21T07:13:16.000Z,
     //  doi: '10.23915/distill.00001',
+    this.doi = undefined;
     this.publishedDate = undefined;
   }
 
@@ -319,6 +322,7 @@ export class FrontMatter {
     Object.assign(target, this);
     target.bibliography = objectFromMap(this.bibliographyEntries);
     target.url = this.url;
+    target.doi = this.doi;
     target.githubUrl = this.githubUrl;
     target.previewURL = this.previewURL;
     if (this.publishedDate) {
diff --git a/src/helpers/citation.js b/src/helpers/citation.js
index 943139e..8971b20 100644
--- a/src/helpers/citation.js
+++ b/src/helpers/citation.js
@@ -61,9 +61,11 @@ function author_string(ent, template, sep, finalSep){
     if (name.indexOf(',') != -1){
       var last = name.split(',')[0].trim();
       var firsts = name.split(',')[1];
-    } else {
+    } else if (name.indexOf(' ') != -1) {
       var last = name.split(' ').slice(-1)[0].trim();
       var firsts = name.split(' ').slice(0,-1).join(' ');
+    } else {
+      var last = name.trim();
     }
     var initials = '';
     if (firsts != undefined) {
@@ -72,7 +74,8 @@ function author_string(ent, template, sep, finalSep){
     }
     return template.replace('${F}', firsts)
       .replace('${L}', last)
-      .replace('${I}', initials);
+      .replace('${I}', initials)
+      .trim(); // in case one of first or last was empty
   });
   if (names.length > 1) {
     var str = name_strings.slice(0, names.length-1).join(sep);