diff --git a/specs/waku/waku-v2.md b/specs/waku/waku-v2.md
index d44c70eb..8be27e63 100644
--- a/specs/waku/waku-v2.md
+++ b/specs/waku/waku-v2.md
@@ -8,9 +8,8 @@ authors: Oskar Thorén <oskar@status.im>
 ## Table of Contents
 
 - [Abstract](#abstract)
-- [Motivation](#motivation)
+- [Motivation and goals](#motivation-and-goals)
 - [Definitions](#definitions)
-- [Goals](#goals)
 - [Underlying Transports and Prerequisites](#underlying-transports-and-prerequisites)
   * [Peer Discovery](#peer-discovery)
   * [PubSub interface](#pubsub-interface)
@@ -18,13 +17,14 @@ authors: Oskar Thorén <oskar@status.im>
   * [FloodSub](#floodsub)
   * [Bridge mode](#bridge-mode)
 - [Wire Specification](#wire-specification)
-  * [Messages](#messages)
+  * [Protobuf](#protobuf)
+  * [Message](#message)
   * [SubOpts](#subopts)
+  * [Historical message support](#historical-message-support)
 - [Changelog](#changelog)
 - [Copyright](#copyright)
 - [References](#references)
 
-
 ## Abstract
 
 Waku is a privacy-preserving peer-to-peer messaging protocol for resource