diff --git a/layouts/404.html b/layouts/404.html
index c6b3dfd..705ffea 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -3,4 +3,5 @@
 {{ define "main" }}
 <h1>404</h1>
 <h2>ʕノ•ᴥ•ʔノ ︵ ┻━┻</h2>
+<p>Why don't you head back to <a href="/">the main page</a>?</p>
 {{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 2545d9a..becb4c0 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -6,6 +6,10 @@
     <a href="{{ "/blog" | relURL }}">Remove filter</a>
   </small>
   {{ end }}
+  {{ .Content }}
+  <div class="post-info">
+    <p>Subscribe to the RSS feed for <i>this view</i> by <a href="index.xml">copying this link</a>.</p>
+  </div>
   <ul class="blog-posts">
     {{ range .Pages }}
     <li>
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
new file mode 100644
index 0000000..cef8657
--- /dev/null
+++ b/layouts/_default/rss.xml
@@ -0,0 +1,39 @@
+{{- $pctx := . -}}
+{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
+{{- $pages := slice -}}
+{{- if or $.IsHome $.IsSection -}}
+{{- $pages = $pctx.RegularPages -}}
+{{- else -}}
+{{- $pages = $pctx.Pages -}}
+{{- end -}}
+{{- $limit := .Site.Config.Services.RSS.Limit -}}
+{{- if ge $limit 1 -}}
+{{- $pages = $pages | first $limit -}}
+{{- end -}}
+{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+    <link>{{ .Permalink }}</link>
+    <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
+    {{ with .Site.LanguageCode }}
+    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
+    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
+    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
+    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
+    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    {{- with .OutputFormats.Get "RSS" -}}
+    {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
+    {{- end -}}
+    {{ range $pages }}
+    <item>
+      <title>{{ .Title }}</title>
+      <link>{{ .Permalink }}</link>
+      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+      <guid>{{ .Permalink }}</guid>
+      <description>{{ .Content | html }}</description>
+    </item>
+    {{ end }}
+  </channel>
+</rss>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index f993a0c..b31b459 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,11 +2,16 @@
 {{ if eq .Type "blog" }}{{ if not .Params.menu }}
 <h1>{{ .Title }}</h1>
 <p>
-  <i>
-    <time datetime='{{ .Date.Format "2006-01-02" }}' pubdate>
-      {{ .Date.Format "02 Jan, 2006" }}
-    </time>
-  </i>
+  <time datetime='{{ .Date.Format "2006-01-02" }}' pubdate>
+    {{ .Date.Format "02 Jan, 2006" }}
+  </time>
+  {{ if .Lastmod }}
+      {{ if not (eq .Lastmod .Date )}}
+      <i>
+          (<b>Updated:</b> {{ dateFormat "2006-01-02" .Lastmod.Local }})
+      </i>
+      {{ end }}
+  {{ end }}
 </p>
 {{ end }}{{ end }}
 <content>
diff --git a/layouts/shortcodes/rawhtml.html b/layouts/shortcodes/rawhtml.html
new file mode 100644
index 0000000..ed3fb8a
--- /dev/null
+++ b/layouts/shortcodes/rawhtml.html
@@ -0,0 +1 @@
+{{.Inner}}
\ No newline at end of file