diff --git a/_data/specification-toc.yml b/_data/specification-toc.yml
index 0160ea2..daf39c2 100644
--- a/_data/specification-toc.yml
+++ b/_data/specification-toc.yml
@@ -47,8 +47,8 @@
       anchor: workspace_executeCommand
     - title: applyEdit
       anchor: workspace_applyEdit
-  - title: Text Document
-    anchor: textDocument
+  - title: Text Synchronization
+    anchor: textSynchronization
     children:
     - title: didOpen
       anchor: textDocument_didOpen
@@ -62,11 +62,17 @@
       anchor: textDocument_didSave
     - title: didClose
       anchor: textDocument_didClose
+  - title: Diagnostics
+    anchor: diagnostics
+    children:
     - title: publishDiagnostics
       anchor: textDocument_publishDiagnostics
+  - title: Language Features
+    anchor: languageFeatures
+    children:
     - title: completion
       anchor: textDocument_completion
-    - title: resolve
+    - title: completion resolve
       anchor: completionItem_resolve
     - title: hover
       anchor: textDocument_hover
@@ -84,11 +90,11 @@
       anchor: textDocument_codeAction
     - title: codeLens
       anchor: textDocument_codeLens
-    - title: resolve
+    - title: codeLens resolve
       anchor: codeLens_resolve
     - title: documentLink
       anchor: textDocument_documentLink
-    - title: resolve
+    - title: documentLink resolve
       anchor: documentLink_resolve
     - title: formatting
       anchor: textDocument_formatting
diff --git a/_implementors/tools.md b/_implementors/tools.md
index 8824023..081c0a0 100644
--- a/_implementors/tools.md
+++ b/_implementors/tools.md
@@ -17,9 +17,9 @@ index: 2
 | emacs | [Vibhav Pant](https://github.com/vibhavp) | [emacs language server client](https://github.com/emacs-lsp/lsp-mode/) |
 |[GNOME Builder](https://wiki.gnome.org/Apps/Builder)| [gnome.org](https://wiki.gnome.org/Apps/Builder/) | [language server client](https://git.gnome.org/browse/gnome-builder/tree/src/libide/langserv) |
 |[MS Monaco Editor](https://github.com/Microsoft/monaco-editor)| [Typefox](https://github.com/TypeFox) | [monaco-languageclient](https://www.npmjs.com/package/monaco-languageclient) |
-|[Atom](https://atom.io/)| [Github](https://github.com/) | [atom-languageclient](https://atom.io/packages/atom-languageclient) |
+|[Atom](https://atom.io/)| [GitHub](https://github.com/) | [atom-languageclient](https://www.npmjs.com/package/atom-languageclient) |
 |[Theia](https://github.com/theia-ide/theia)| [theia-ide](https://github.com/theia-ide) | [theia](https://github.com/theia-ide/theia) |
-|[neovim](https://neovim.io/)| [Junfeng Li](https://github.com/autozimu) | [LanguageClient-neovim](https://github.com/autozimu/LanguageClient-neovim) |
+|vim8 and [neovim](https://neovim.io/)| [Junfeng Li](https://github.com/autozimu) | [LanguageClient-neovim](https://github.com/autozimu/LanguageClient-neovim) |
 |vim8 and neovim| [Prabir Shrestha](https://github.com/prabirshrestha) | [vim-lsp](https://github.com/prabirshrestha/vim-lsp) |
 |Visual Studio| [Adam Friedman](https://github.com/tintoy) | [LSP client in Visual Studio](https://github.com/tintoy/dotnet-language-client/tree/sample/visual-studio/samples/VisualStudioExtension) |
 |Visual Studio| Microsoft | [LSP Preview](https://marketplace.visualstudio.com/items?itemName=vsext.LanguageServerClientPreview) |
diff --git a/specification.md b/specification.md
index 159a150..5d1be14 100644
--- a/specification.md
+++ b/specification.md
@@ -179,6 +179,7 @@ The base protocol offers support for request cancellation. To cancel a request,
 _Notification_:
 * method: '$/cancelRequest'
 * params: `CancelParams` defined as follows:
+
 ```typescript
 interface CancelParams {
 	/**
@@ -1092,6 +1093,7 @@ interface ClientCapabilities {
 
 _Response_:
 * result: `InitializeResult` defined as follows:
+
 ```typescript
 interface InitializeResult {
 	/**
@@ -1101,6 +1103,7 @@ interface InitializeResult {
 }
 ```
 * error.code:
+
 ```typescript
 /**
  * Known error codes for an `InitializeError`;
@@ -1116,6 +1119,7 @@ export namespace InitializeError {
 ```
 
 * error.data:
+
 ```typescript
 interface InitializeError {
 	/**