diff --git a/README.md b/README.md
index 015c5ca34..b9c28f557 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,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 works best with GPT-4o, Claude 3 Opus
+Aider works best with GPT-4o and Claude 3 Opus
 and can [connect to almost any LLM](https://aider.chat/docs/llms.html).
 
 <p align="center">
@@ -47,7 +47,7 @@ $ aider --opus
 - Aider will edit your files to complete your request.
 - Aider [automatically git commits](https://aider.chat/docs/faq.html#how-does-aider-use-git) changes with a sensible commit message.
 - Aider works with [most popular languages](https://aider.chat/docs/languages.html): python, javascript, typescript, php, html, css, and more...
-- Aider works best with GPT-4o, Claude 3 Opus
+- Aider works best with GPT-4o and Claude 3 Opus
 and can [connect to almost any LLM](https://aider.chat/docs/llms.html).
 - Aider can make coordinated changes across multiple files at once.
 - Aider uses a [map of your entire git repo](https://aider.chat/docs/repomap.html), which helps it work well in larger codebases.
@@ -75,7 +75,7 @@ So you can bounce back and forth between aider and your editor, to collaborative
 
 Aider has the
 [highest score on SWE Bench](https://aider.chat/2024/06/02/main-swe-bench.html),
-a challenging sofrware engineering benchmark where aider
+a challenging software engineering benchmark where aider
 solves GitHub issues.
 
 <p align="center">
diff --git a/website/docs/options.md b/website/docs/options.md
index f5f8d3870..f5be51531 100644
--- a/website/docs/options.md
+++ b/website/docs/options.md
@@ -1,22 +1,40 @@
 ---
-title: Configuration & options
 nav_order: 800
 ---
 
-# Command line reference
+# Configuration & options
 
 Aider has many options which can be set with
 command line switches.
 
 Most command line switches can also be set in an `.aider.conf.yml` file
 which can be placed in your home directory or at the root of
-your git repo.
-A command line switch like `--option-foo VALUE` can be
-added to the yaml file as a line like `option-foo: VALUE`.
-
-Many switches can also be set via environment variables like `AIDER_OPTION_FOO`,
+your git repo. 
+Ot via environment variables like `AIDER_OPTION_FOO`,
 as noted in the help text below.
 
+Here are 3 equivalent ways of setting an option. First, via a command line switch:
+
+```
+$ aider --dark-mode
+```
+
+Or, via an env variable:
+
+```
+export AIDER_DARK_MODE=true
+```
+
+Or in the `.aider.conf.yml` file:
+
+```yaml
+dark-mode: true
+```
+
+## Command line reference
+
+Use `aider --help` to see all the available options.
+
 <!--[[[cog
 from aider.args import get_help
 cog.outl("```")
diff --git a/website/index.md b/website/index.md
index c3c0995c3..6889b13a7 100644
--- a/website/index.md
+++ b/website/index.md
@@ -12,7 +12,7 @@ cog.out(open("README.md").read())
 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 works best with GPT-4o, Claude 3 Opus
+Aider works best with GPT-4o and Claude 3 Opus
 and can [connect to almost any LLM](https://aider.chat/docs/llms.html).
 
 <p align="center">
@@ -55,7 +55,7 @@ $ aider --opus
 - Aider will edit your files to complete your request.
 - Aider [automatically git commits](https://aider.chat/docs/faq.html#how-does-aider-use-git) changes with a sensible commit message.
 - Aider works with [most popular languages](https://aider.chat/docs/languages.html): python, javascript, typescript, php, html, css, and more...
-- Aider works best with GPT-4o, Claude 3 Opus
+- Aider works best with GPT-4o and Claude 3 Opus
 and can [connect to almost any LLM](https://aider.chat/docs/llms.html).
 - Aider can make coordinated changes across multiple files at once.
 - Aider uses a [map of your entire git repo](https://aider.chat/docs/repomap.html), which helps it work well in larger codebases.
@@ -83,7 +83,7 @@ So you can bounce back and forth between aider and your editor, to collaborative
 
 Aider has the
 [highest score on SWE Bench](https://aider.chat/2024/06/02/main-swe-bench.html),
-a challenging sofrware engineering benchmark where aider
+a challenging software engineering benchmark where aider
 solves GitHub issues.
 
 <p align="center">