diff --git a/README.md b/README.md
index b49bd26..dfb9a3e 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@ If you have a comment or suggestion, please open an [issue](https://github.com/d
 
 1. [Purchase YubiKey](#1-purchase-yubikey)  
 2. [Install required software](#2-install-required-software)  
-  2.1 [Install - Linux](#21-install-linux)  
-  2.2 [Install - macOS](#22-install-macos)  
-  2.3 [Install - Windows](#23-install-windows)  
+  2.1 [Install - Linux](#21-install---linux)  
+  2.2 [Install - macOS](#22-install---macos)  
+  2.3 [Install - Windows](#23-install---windows)  
 3. [Creating keys](#3-creating-keys)  
   3.1 [Create temporary working directory for GPG](#31-create-temporary-working-directory-for-gpg)  
   3.2 [Create configuration](#32-create-configuration)  
@@ -23,49 +23,49 @@ If you have a comment or suggestion, please open an [issue](https://github.com/d
   3.5 [Create subkeys](#35-create-subkeys)  
     3.5a [Signing key](#35a-signing-key)  
     3.5b [Encryption key](#35b-encryption-key)  
-    3.5c [Authentication key](#35cauthentication-key)  
+    3.5c [Authentication key](#35c-authentication-key)  
   3.6 [Check your work](#36-check-your-work)  
   3.7 [Export keys](#37-export-keys)  
-		3.7a [Linux/macOS](#37a-export-keys-linux)  
-		3.7b [Windows](#37b-export-keys-windows)  
+		3.7a [Linux/macOS](#37a-linuxmacos)  
+		3.7b [Windows](#37b-windows)  
   3.8 [Backup everything](#38-backup-everything)  
-		3.8a [Linux/macOS](#38a-backup-keys-linux)  
-		3.8b [Windows](#38b-backup-keys-windows)  
+		3.8a [Linux/macOS](#38a-linuxmacos)  
+		3.8b [Windows](#38b-windows)  
   3.9 [Configure YubiKey](#39-configure-yubikey)  
-		3.9a [Linux/macOS](#39aconfigure-linux)  
-		3.9b [Windows](#39b-configure-windows)  
+		3.9a [Linux/macOS](#39a-linuxmacos)  
+		3.9b [Windows](#39b-windows)  
   3.10 [Configure smartcard](#310-configure-smartcard)  
 	  3.10a [Change PINs](#310a-change-pins)  
 	  3.10b [Set card information](#310b-set-card-information)  
   3.11 [Transfer keys](#311-transfer-keys)  
     3.11a [Signature key](#311a-signature-key)  
-    3.11b [Encryption key](#311b-encryption-key-1)  
-    3.11c [Authentication key](#311c-authentication-key-1)  
-  3.12 [Check your work](#312-check-your-work-1)  
+    3.11b [Encryption key](#311b-encryption-key)  
+    3.11c [Authentication key](#311c-authentication-key)  
+  3.12 [Check your work](#312-check-your-work)  
   3.13 [Export public key](#313-export-public-key)  
   3.14 [Finish](#314-finish)  
 4. [Using keys](#4-using-keys)  
   4.1 [Create GPG configuration](#41-create-gpg-configuration)  
   4.2 [Import public key](#42-import-public-key)  
   4.3 [Insert YubiKey](#43-insert-yubikey)  
-  4.4 [GnuPG](#44-gnupg)
+  4.4 [GnuPG](#44-gnupg)  
     4.4a [Trust master key](#44a-trust-master-key)  
     4.4b [Encryption](#44b-encryption)  
     4.4c [Decryption](#44c-decryption)  
     4.4d [Signing](#44d-signing)  
     4.4e [Verifying signature](#44e-verifying-signature)  
-  4.5 [SSH - Linux/Mac](#45-ssh-linux)  
+  4.5 [SSH - Linux/Mac](#45-ssh---linuxmacos)  
     4.5a [Update configuration](#45a-update-configuration)  
     4.5b [Replace ssh-agent with gpg-agent](#45b-replace-ssh-agent-with-gpg-agent)  
     4.5c [Copy public key to server](#45c-copy-public-key-to-server)  
     4.5d [Connect with public key authentication](#45d-connect-with-public-key-authentication)  
-  4.6 [SSH - Windows](#46-ssh-windows)  
-	4.6a [GitHub](#46a-ssh-windows-github)  
-  4.7 [Requiring touch to authenticate](#4.7-requiring-touch-to-authenticate)  
+  4.6 [SSH - Windows](#46-ssh---windows)  
+	4.6a [GitHub](#46a-github)  
+  4.7 [Requiring touch to authenticate](#47-requiring-touch-to-authenticate)  
   4.8 [OpenBSD](#48-openbsd)  
 5. [Troubleshooting](#5-troubleshooting)  
   5.1 [Yubikey OTP Mode and cccccccc....](#51-yubikey-otp-mode-and-cccccccc)  
-6. [References and other work](#6-references-and-other-work)  
+6. [References and other work](#6-references-and-similar-work)  
 
 # 1. Purchase YubiKey
 
@@ -899,7 +899,7 @@ Save and quit:
     ssb>  rsa4096/0x3F29127E79649A3D 2017-10-09 [A]
 
 
-## 3.12 Export public key
+## 3.13 Export public key
 
 This file should be publicly shared: