diff --git a/README.md b/README.md
index a0fa3db..626523e 100644
--- a/README.md
+++ b/README.md
@@ -15,15 +15,15 @@ We developed the _recorder_ as a one-stop solution to storing location data publ
 * [`recorder`](#recorder)
 * [Installing](#installing)
 * [Building from source](#building-from-source)
-* [Getting started](#building-from-source)
+* [Getting started](#getting-started)
 * [`ot-recorder` options and variables](#ot-recorder-options-and-variables)
 * [The HTTP Server](#the-http-server)
   * [Last position of a particular user](#last-position-of-a-particular-user)
-  * [Display map with points starting at a particular date](#last-position-of-a-particular-user)
+  * [Display map with points starting at a particular date](#display-map-with-points-starting-at-a-particular-date)
   * [Display a track (a.k.a. linestring)](#display-a-track-aka-linestring)
   * [Tabular display](#tabular-display)
   * [Live map](#live-map)
-* [`ocat`](#live-map)
+* [`ocat`](#ocat)
 * [`ocat` examples](#ocat-examples)
   * [List users and devices](#list-users-and-devices)
   * [Show the last position reported by a user](#show-the-last-position-reported-by-a-user)
@@ -32,11 +32,11 @@ We developed the _recorder_ as a one-stop solution to storing location data publ
 * [Storage](#storage)
 * [Configuration file](#configuration-file)
 * [Reverse Geo](#reverse-geo)
-  * [Precision](#reverse-geo)
+  * [Precision](#precisioin)
   * [The geo cache](#the-geo-cache)
 * [Monitoring](#monitoring)
-* [HTTP server](#monitoring)
-  * [API](#monitoring)
+* [HTTP server](#http-server)
+  * [API](#api)
     * [`monitor`](#monitor)
 	* [`last`](#last)
 	* [`list`](#list)
@@ -53,8 +53,8 @@ We developed the _recorder_ as a one-stop solution to storing location data publ
   * [`otr_httpobject`](#otr_httpobject)
   * [Hooklets](#hooklets)
 * [Environment](#environment)
-* [Reverse proxy](#environment)
-  * [nginx](#environment)
+* [Reverse proxy](#reverse-proxy)
+  * [nginx](#nginx)
   * [Apache](#apache)
 * [Views](#views)
   * [view JSON](#view-json)