diff --git a/partials/md/section/education.hbs b/partials/md/section/education.hbs
index 68bb2cc..e8bbd62 100644
--- a/partials/md/section/education.hbs
+++ b/partials/md/section/education.hbs
@@ -3,15 +3,17 @@
 
 {{#each r.education.history}}
 {{#if url}}
-### [{{{ institution }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### [{{{ institution }}}]({{{ url }}}) ({{dateRange .}})
 {{else}}
-### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### {{{ institution }}} ({{dateRange .}})
 {{/if}}
+
 {{#if summary }}
 {{{ summary }}}
 {{/if}}
 {{#if courses}}
 {{#each courses}}
   - {{{ this }}}{{/each}}{{/if}}
+
 {{/each}}
 {{/section}}
diff --git a/partials/md/section/employment.hbs b/partials/md/section/employment.hbs
index 360dd96..8e634e6 100644
--- a/partials/md/section/employment.hbs
+++ b/partials/md/section/employment.hbs
@@ -2,12 +2,12 @@
 ## {{{sectionTitle "EMPLOYMENT"}}}
 
 {{#each r.employment.history }}
-
 {{#if url}}
 ### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
 {{else}}
 ### *{{{ position }}}*, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
 {{/if}}
+
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
diff --git a/partials/md/section/projects.hbs b/partials/md/section/projects.hbs
index 04eee45..6274e5f 100644
--- a/partials/md/section/projects.hbs
+++ b/partials/md/section/projects.hbs
@@ -7,6 +7,7 @@
 {{else}}
 ### *{{{camelCase role }}}*, {{{ title }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
 {{/if}}
+
 {{{ description }}}
 {{{ summary }}}
 {{#if highlights}}
@@ -15,5 +16,6 @@
 
 {{/each}}
 {{/if}}
+
 {{/each}}
 {{/section}}
diff --git a/partials/md/section/recognition.hbs b/partials/md/section/recognition.hbs
index 747891d..5a6a77a 100644
--- a/partials/md/section/recognition.hbs
+++ b/partials/md/section/recognition.hbs
@@ -3,6 +3,8 @@
 
 {{#each r.recognition}}
 ### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+
 {{{ summary }}}
+
 {{/each}}
 {{/section}}
diff --git a/partials/md/section/samples.hbs b/partials/md/section/samples.hbs
index ddd8168..7069fa9 100644
--- a/partials/md/section/samples.hbs
+++ b/partials/md/section/samples.hbs
@@ -1,17 +1,19 @@
 {{#section 'samples'}}
 ## {{{sectionTitle "SAMPLES"}}}
 
-{{#each r.samples.history }}
+{{#each r.samples }}
 {{#if url}}
 ### [{{{ title }}}]({{{ url }}}) ({{formatDate safe.date 'YYYY-MM' }})
 {{else}}
 ### {{{ title }}} ({{formatDate safe.date}})
 {{/if}}
+
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
   - {{{ this }}}
 {{/each}}
 {{/if}}
+
 {{/each}}
 {{/section}}
diff --git a/partials/md/section/service.hbs b/partials/md/section/service.hbs
index 87dd9c5..eeb5613 100644
--- a/partials/md/section/service.hbs
+++ b/partials/md/section/service.hbs
@@ -3,15 +3,17 @@
 
 {{#each r.service.history }}
 {{#if url}}
-### [{{{ organization }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{ position }}}*, [{{{ organization }}}]({{{ url }}}) ({{dateRange.}})
 {{else}}
-### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{ position }}}*, {{{ organization }}} ({{dateRange .}})
 {{/if}}
+
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
   - {{{ this }}}
 {{/each}}
 {{/if}}
+
 {{/each}}
 {{/section}}
diff --git a/partials/md/section/speaking.hbs b/partials/md/section/speaking.hbs
new file mode 100644
index 0000000..027cea6
--- /dev/null
+++ b/partials/md/section/speaking.hbs
@@ -0,0 +1,15 @@
+{{#section 'speaking'}}
+## {{{sectionTitle "SPEAKING"}}}
+
+{{#each r.speaking}}
+### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
diff --git a/partials/md/section/writing.hbs b/partials/md/section/writing.hbs
index 6ff922c..b1cfb96 100644
--- a/partials/md/section/writing.hbs
+++ b/partials/md/section/writing.hbs
@@ -2,7 +2,13 @@
 ## WRITING
 
 {{#each r.writing}}
+{{#if url}}
+### [{{{ title }}}]({{{ url }}}) ({{formatDate safe.date 'YYYY-MM' }})
+{{else}}
 ### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{/if}}
+
 {{{ summary }}}
+
 {{/each}}
 {{/section}}