diff --git a/docs/FAQ.md b/docs/FAQ.md
index 0c3402e7..22c60842 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,6 +1,16 @@
 Frequently asked questions
 ==========================
 
+1. [How do I calculate the step_distance parameter in the printer config file?](#how-do-i-calculate-the-step_distance-parameter-in-the-printer-config-file)
+2. [Where's my serial port?](#wheres-my-serial-port)
+3. [The "make flash" command doesn't work](#the-make-flash-command-doesnt-work)
+4. [How do I change the serial baud rate?](#how-do-i-change-the-serial-baud-rate)
+5. [Can I run Klipper on something other than a Raspberry Pi 3?](#can-i-run-klipper-on-something-other-than-a-raspberry-pi-3)
+6. [Why can't I move the stepper before homing the printer?](#why-cant-i-move-the-stepper-before-homing-the-printer)
+7. [Why is the Z position_endstop set to 0.5 in the default configs?](#why-is-the-z-position_endstop-set-to-05-in-the-default-configs)
+8. [I converted my config from Marlin and the X/Y axes work fine, but I just get a screeching noise when homing the Z axis](#i-converted-my-config-from-marlin-and-the-xy-axes-work-fine-but-i-just-get-a-screeching-noise-when-homing-the-z-axis)
+9. [When I set "restart_method=command" my AVR device just hangs on a restart](#when-i-set-restart_methodcommand-my-avr-device-just-hangs-on-a-restart)
+
 ### How do I calculate the step_distance parameter in the printer config file?
 
 If you know the steps per millimeter for the axis then use a
@@ -39,7 +49,7 @@ serial: /dev/serial/by-id/usb-UltiMachine__ultimachine.com__RAMBo_12345678912345
 Be sure to copy-and-paste the name from the "ls" command that you ran
 above as the name will be different for each printer.
 
-### The "make flash" command doesn't work.
+### The "make flash" command doesn't work
 
 The code attempts to flash the device using the most common method for
 each platform. Unfortunately, there is a lot of variance in flashing
@@ -177,7 +187,7 @@ device (the power or status LEDs may also blink repeatedly until the
 power is removed).
 
 The workaround is to use a restart_method other than "command" or to
-flash an updated bootloader to the AVR devices. Flashing a new
+flash an updated bootloader to the AVR device. Flashing a new
 bootloader is a one time step that typically requires an external
 programmer - search the web to find the instructions for your
 particular device.