diff --git a/assets/css/main.css b/assets/css/main.css
index 1e72a3e..a298753 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -152,7 +152,7 @@ html {
 		margin: -.75em -.25em;
 	}
 
-	header a[href="#main"], /* skip link */
+	a[href="#h1"], /* skip link */
 	div[itemprop="comment"] dd > a ,
 	footer > nav,
 	/* List items with direct hyperlink children should only have one hyperlink. */
@@ -187,13 +187,13 @@ html {
 	}
 
 	/* skip link: make it invisible until focused, and put it on the top. */
-	header a[href="#main"] {
+	a[href="#h1"] {
 		position: absolute;
 		top: -2em;
 		padding: 0 .25em;
 	}
 
-	header a[href="#main"]:focus {
+	a[href="#h1"]:focus {
 		top: 0;
 	}
 }
diff --git a/layouts/_default/404.html b/layouts/_default/404.html
index 5f37ef6..48b21b2 100644
--- a/layouts/_default/404.html
+++ b/layouts/_default/404.html
@@ -14,7 +14,7 @@
 {{ $resources = $resources | append (resources.Get "css/print.css" | resources.ExecuteAsTemplate "print.css" .) -}}
 {{- $css := $resources | resources.Concat "css/style.css" | minify -}}
 <style>{{ $css.Content | safeCSS }}</style>
-<meta name="robots" content="noindex,nofollow" />
+<meta name="robots" content="noindex,nofollow,nosnippet" />
 <title>{{ .Title }}</title>
 {{ if not (in site.BaseURL ".onion") -}}
 {{ $icon_svg := resources.Get "/favicon.svg" | resources.Fingerprint "md5" }}
@@ -28,6 +28,7 @@
 </head>
 <body>
 <header>
+	<a href="#h1">Skip to content</a>
 	<nav aria-label="Global">
 		<ul>
 			<li>
@@ -45,11 +46,14 @@
 			<li>
 				<a href="/about/">About</a>
 			</li>
+			<li>
+				<a href="/meta/">Meta</a>
+			</li>
 		</ul>
 	</nav>
 </header>
 <main>
-	<h1>{{ .Title }}</h1>
+	<h1 id="h1" tabindex="-1">{{ .Title }}</h1>
 	{{ partial "processed-content.html" . -}}
 </main>
 <footer>
@@ -62,7 +66,7 @@
 				<a rel="source" href="{{ .Site.Params.src }}">Source code</a>
 			</li>
 			<li>
-				<a rel="alternate" href="http://wgq3bd2kqoybhstp77i3wrzbfnsyd27wt34psaja4grqiezqircorkyd.onion{{ .RelPermalink }}">Tor mirror</a>
+				<a rel="alternate" href="http://wgq3bd2kqoybhstp77i3wrzbfnsyd27wt34psaja4grqiezqircorkyd.onion/">Tor mirror</a>
 			</li>
 			<li>
 				<a href="{{ site.BaseURL }}privacy/">Privacy</a>
diff --git a/layouts/_default/bookmarks.html b/layouts/_default/bookmarks.html
index 9902787..bc3e0d2 100644
--- a/layouts/_default/bookmarks.html
+++ b/layouts/_default/bookmarks.html
@@ -1,7 +1,7 @@
 {{ define "main" -}}
-<main id="main" tabindex="-1"
+<main
  itemprop="mainEntity" class="h-feed hfeed" itemscope="" itemtype="https://schema.org/DataFeed">
-	<h1 id="bookmarks" class="p-name" itemprop="name headline">My book&#173;marks</h1>
+	<h1 id="h1" tabindex="-1" class="p-name" itemprop="name headline">My book&#173;marks</h1>
 	{{ partial "processed-content.html" . }}
 	<p role="doc-tip">
 		Timestamp format: <code>YYYY-MM-DD HH:MM</code>, as per <cite><a href="https://www.ietf.org/rfc/rfc3339.txt">RFC 3339</a></cite>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 84352aa..af70bcf 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,5 @@
 {{ define "main" -}}
-<main id="main" tabindex="-1"
+<main
  itemprop="mainEntity" class="h-feed hfeed" itemscope="" itemtype="https://schema.org/DataFeed">
 	{{ partial "processed-content.html" . }}
 	<p role="doc-tip">
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index 610fed9..2929f1d 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -1,7 +1,7 @@
 {{ define "main" -}}
 {{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
-<main id="main" tabindex="-1">
-	<h1>Search</h1>
+<main>
+	<h1 id="h1" tabindex="-1">Search</h1>
 	<p role="note">This page is an unfinished work-in-progress.</p>
 	{{ partial "search.html" . }}
 	<hr />
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 344242a..d921f57 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,6 @@
 {{ define "main" -}}
 {{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
-<main id="main" tabindex="-1"
+<main
 	itemprop="mainEntity" itemscope="" itemtype="https://schema.org/Article" itemid="{{ .Site.Params.CanonicalBaseURL }}{{ $canonicalRelPermalink }}">
 	{{ partial "full-article.html" . }}
 </main>
diff --git a/layouts/about/list.html b/layouts/about/list.html
index 3a820e2..81e938a 100644
--- a/layouts/about/list.html
+++ b/layouts/about/list.html
@@ -1,6 +1,6 @@
 {{ define "main" -}}
 {{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
-<main id="main" tabindex="-1">
+<main>
 	{{- $articleTag := printf `<article class="h-entry hentry" itemprop="mainEntity" itemscope="" itemtype="https://schema.org/Article" itemid="%s%s">` .Site.Params.CanonicalBaseURL $canonicalRelPermalink -}}
 	{{ partial "full-article.html" . | replaceRE `<article class="h-entry hentry">` $articleTag | safeHTML }}
 <hr />
diff --git a/layouts/index.html b/layouts/index.html
index 8de6db5..06c78af 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,6 +1,6 @@
 {{ define "main" -}}
-<main id="main" tabindex="-1">
-<h1 id="seirdys-home">Seirdy’s Home</h1>
+<main>
+<h1 id="h1" tabindex="-1">Seirdy’s Home</h1>
 <p itemprop="description">{{ .Site.Params.Description }}</p>
 <hr />
 <div class="narrow">
diff --git a/layouts/meta/list.html b/layouts/meta/list.html
index 8e1895e..91769b7 100644
--- a/layouts/meta/list.html
+++ b/layouts/meta/list.html
@@ -1,6 +1,6 @@
 {{ define "main" -}}
 {{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
-<main id="main" tabindex="-1">
+<main>
 	{{- $articleTag := printf `<article class="h-entry hentry" itemprop="mainEntity" itemscope="" itemtype="https://schema.org/Article" itemid="%s%s">` .Site.Params.CanonicalBaseURL $canonicalRelPermalink -}}
 	{{ partial "full-article.html" . | replaceRE `<article class="h-entry hentry">` $articleTag | safeHTML }}
 <hr />
diff --git a/layouts/notes/single.html b/layouts/notes/single.html
index a7a602a..d5f60bd 100644
--- a/layouts/notes/single.html
+++ b/layouts/notes/single.html
@@ -1,6 +1,6 @@
 {{- define "main" -}}
 {{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
-<main id="main" tabindex="-1"
+<main
  itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting" itemid="{{ .Site.Params.CanonicalBaseURL }}{{ $canonicalRelPermalink }}">
 	<link itemprop="isPartOf" href="{{ .Site.Params.CanonicalBaseURL }}/" />
 	{{ partial "full-article.html" . }}
diff --git a/layouts/partials/full-article.html b/layouts/partials/full-article.html
index 91914a4..d17dbf0 100644
--- a/layouts/partials/full-article.html
+++ b/layouts/partials/full-article.html
@@ -1,6 +1,6 @@
 <article class="h-entry hentry"><!--Once WAI-ARIA 1.3 gains traction, I'll add aria-details for webmentions.-->
 <header>
-	<h1 itemprop="name headline" class="p-name entry-title">{{ .Title }}</h1>
+	<h1 itemprop="name headline" class="p-name entry-title" id="h1" tabindex="-1">{{ .Title }}</h1>
 	{{- if not .Params.disableMeta -}}
 	{{- partial "post-meta.html" . -}}
 	{{- end -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index cb44cc0..6790b68 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,5 +1,5 @@
 	<header>
-		<a href="#main">Skip to content</a>
+		<a href="#h1">Skip to content</a>
 		<nav aria-label="Global">
 			<ul>
 				{{- $currentPage := . -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 642df1b..72c9f4c 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -1,7 +1,7 @@
 {{- define "main" -}}
 {{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
 {{- .Scratch.Set "codeIndex" 1 -}}
-<main id="main" tabindex="-1"
+<main
  itemprop="mainEntity" itemscope="" itemtype="https://schema.org/BlogPosting{{ with .Params.articleType }} https://schema.org/{{ . }}{{ end }}" itemid="{{ .Site.Params.CanonicalBaseURL }}{{ $canonicalRelPermalink }}">
 	<link itemprop="isPartOf" href="{{ .Site.Params.CanonicalBaseURL }}/" />
 	{{ partial "full-article.html" . }}
