diff --git a/README.md b/README.md
index 78af92915..3bdbc20a4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Aider lets you pair program with LLMs,
to edit code in your local git repository.
Start a new project or work with an existing git repo.
Aider can [connect to almost any LLM](https://aider.chat/docs/llms.html).
-and works best with GPT-4o, Claude 3.5 Sonnet and Claude 3 Opus.
+and works best with GPT-4o, Claude 3.5 Sonnet, Claude 3 Opus and DeepSeek Coder V2.
-
-
-
-
-
## More info
- [Documentation](https://aider.chat/)
diff --git a/website/HISTORY.md b/website/HISTORY.md
index 044c1652c..4e84bf086 100644
--- a/website/HISTORY.md
+++ b/website/HISTORY.md
@@ -1,5 +1,6 @@
---
title: Release history
+parent: More info
nav_order: 999
---
diff --git a/website/_data/edit_leaderboard.yml b/website/_data/edit_leaderboard.yml
index 1b5bf476d..c7c4a0efc 100644
--- a/website/_data/edit_leaderboard.yml
+++ b/website/_data/edit_leaderboard.yml
@@ -44,29 +44,6 @@
seconds_per_case: 23.1
total_cost: 0.0000
-- dirname: 2024-06-17-14-45-54--deepseek-coder2-whole
- test_cases: 133
- model: DeepSeek Coder V2
- edit_format: whole
- commit_hash: ca8672b
- pass_rate_1: 63.9
- pass_rate_2: 75.2
- percent_cases_well_formed: 100.0
- error_outputs: 1
- num_malformed_responses: 0
- num_with_malformed_responses: 0
- user_asks: 1
- lazy_comments: 0
- syntax_errors: 1
- indentation_errors: 0
- exhausted_context_windows: 0
- test_timeouts: 7
- command: aider --model deepseek/deepseek-coder
- date: 2024-06-17
- versions: 0.38.1-dev
- seconds_per_case: 21.1
- total_cost: 0.0537
-
- dirname: 2024-05-03-20-47-24--gemini-1.5-pro-diff-fenced
test_cases: 133
model: gemini-1.5-pro-latest
@@ -658,4 +635,50 @@
versions: 0.38.1-dev
seconds_per_case: 21.6
total_cost: 0.0000
+
+- dirname: 2024-06-17-14-45-54--deepseek-coder2-whole
+ test_cases: 133
+ model: DeepSeek Coder V2 (whole)
+ edit_format: whole
+ commit_hash: ca8672b
+ pass_rate_1: 63.9
+ pass_rate_2: 75.2
+ percent_cases_well_formed: 100.0
+ error_outputs: 1
+ num_malformed_responses: 0
+ num_with_malformed_responses: 0
+ user_asks: 1
+ lazy_comments: 0
+ syntax_errors: 1
+ indentation_errors: 0
+ exhausted_context_windows: 0
+ test_timeouts: 7
+ command: aider --model deepseek/deepseek-coder
+ date: 2024-06-17
+ versions: 0.38.1-dev
+ seconds_per_case: 21.1
+ total_cost: 0.0537
+
+- dirname: 2024-06-21-15-29-08--deepseek-coder2-diff-again3
+ test_cases: 133
+ model: DeepSeek Coder V2 (diff)
+ edit_format: diff
+ commit_hash: 515ab3e
+ pass_rate_1: 58.6
+ pass_rate_2: 66.2
+ percent_cases_well_formed: 98.5
+ error_outputs: 23
+ num_malformed_responses: 5
+ num_with_malformed_responses: 2
+ user_asks: 2
+ lazy_comments: 0
+ syntax_errors: 0
+ indentation_errors: 1
+ exhausted_context_windows: 0
+ test_timeouts: 2
+ command: aider --model deepseek/deepseek-coder
+ date: 2024-06-21
+ versions: 0.39.1-dev
+ seconds_per_case: 30.2
+ total_cost: 0.0857
\ No newline at end of file
diff --git a/website/docs/faq.md b/website/docs/faq.md
index a1443b1e8..f32872828 100644
--- a/website/docs/faq.md
+++ b/website/docs/faq.md
@@ -1,9 +1,9 @@
---
-nav_order: 85
+nav_order: 90
description: Frequently asked questions about aider.
---
-# Frequently asked questions
+# FAQ
{: .no_toc }
- TOC
diff --git a/website/docs/git.md b/website/docs/git.md
index f9c8bb5ad..ea2b145fe 100644
--- a/website/docs/git.md
+++ b/website/docs/git.md
@@ -1,4 +1,5 @@
---
+parent: More info
nav_order: 800
description: Aider is tightly integrated with git.
---
diff --git a/website/docs/languages.md b/website/docs/languages.md
index 889e4caa9..d74f748c9 100644
--- a/website/docs/languages.md
+++ b/website/docs/languages.md
@@ -1,4 +1,5 @@
---
+parent: More info
nav_order: 900
description: Aider supports pretty much all popular coding languages.
---
diff --git a/website/docs/llms.md b/website/docs/llms.md
index 76862b2e6..37cd82f7a 100644
--- a/website/docs/llms.md
+++ b/website/docs/llms.md
@@ -14,17 +14,21 @@ description: Aider can connect to most LLMs for AI pair programming.
## Best models
{: .no_toc }
-**Aider works best with [GPT-4o](/docs/llms/openai.html),
-[Claude 3.5 Sonnet and Claude 3 Opus](/docs/llms/anthropic.html),**
-as they are the very best models for editing code.
+Aider works best with these models, which are skilled at editing code:
+
+- [GPT-4o](/docs/llms/openai.html)
+- [Claude 3.5 Sonnet](/docs/llms/anthropic.html)
+- [Claude 3 Opus](/docs/llms/anthropic.html)
+- [DeepSeek Coder V2](/docs/llms/deepseek.html)
+
## Free models
{: .no_toc }
Aider works with a number of **free** API providers:
-- The [DeepSeek Coder V2](/docs/llms/deepseek.html) model gets the top score on aider's code editing benchmark. DeepSeek currently offers 5M free tokens of API usage.
-- Google's [Gemini 1.5 Pro](/docs/llms/gemini.html) is the most capable free model to use with aider, with
+- The [DeepSeek Coder V2](/docs/llms/deepseek.html) model gets the top score on aider's code editing benchmark. DeepSeek has been offering 5M free tokens of API usage.
+- Google's [Gemini 1.5 Pro](/docs/llms/gemini.html) works with aider, with
code editing capabilities similar to GPT-3.5.
- You can use [Llama 3 70B on Groq](/docs/llms/groq.html) which is comparable to GPT-3.5 in code editing performance.
- Cohere also offers free API access to their [Command-R+ model](/docs/llms/cohere.html), which works with aider as a *very basic* coding assistant.
diff --git a/website/docs/more-info.md b/website/docs/more-info.md
new file mode 100644
index 000000000..3b40cb9e1
--- /dev/null
+++ b/website/docs/more-info.md
@@ -0,0 +1,8 @@
+---
+has_children: true
+nav_order: 85
+---
+
+# More info
+
+See below for more info about aider, including some advanced topics.
diff --git a/website/docs/repomap.md b/website/docs/repomap.md
index aefedc5dc..359243103 100644
--- a/website/docs/repomap.md
+++ b/website/docs/repomap.md
@@ -1,4 +1,5 @@
---
+parent: More info
highlight_image: /assets/robot-ast.png
nav_order: 900
description: Aider uses a map of your git repository to provide code context to LLMs.
diff --git a/website/docs/scripting.md b/website/docs/scripting.md
index 2d6149d31..984ecb864 100644
--- a/website/docs/scripting.md
+++ b/website/docs/scripting.md
@@ -1,4 +1,5 @@
---
+parent: More info
nav_order: 900
description: You can script aider via the command line or python.
---
diff --git a/website/index.md b/website/index.md
index 7d847f65d..cbf8498df 100644
--- a/website/index.md
+++ b/website/index.md
@@ -21,7 +21,7 @@ Aider lets you pair program with LLMs,
to edit code in your local git repository.
Start a new project or work with an existing git repo.
Aider can [connect to almost any LLM](https://aider.chat/docs/llms.html).
-and works best with GPT-4o, Claude 3.5 Sonnet and Claude 3 Opus.
+and works best with GPT-4o, Claude 3.5 Sonnet, Claude 3 Opus and DeepSeek Coder V2.
-
-
-
-
-
## More info
- [Documentation](https://aider.chat/)