diff --git a/docs/index.html b/docs/index.html
index 791919334..41920433e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -578,7 +578,7 @@
   <p>At this point, you may want to set the locations for snapshot images. This
   is described in more detail in <b><a href="#ROMInfo">ROM Launcher</a></b>.
   These settings are optional, and can be left at the defaults if you won't be
-  using snapshots in the ROM launcher. </p>
+  using snapshots in the ROM launcher.</p>
 
   <p>You can start emulation by selecting a ROM and pressing 'Enter' or clicking 'Select',
   or double-clicking a ROM. Note that some games require you to 'Reset' the console
@@ -606,8 +606,8 @@
   <p>While playing a game, normally one would use the keyboard shortcuts for controlling the
   'virtual' switches in Stella (ie, the commands associated with the
   function keys as described in
-  <b>Getting Started - <a href="#Keyboard">Keyboard Layout</a></b>).
-  However, another alternative is available. Pressing the '\' key toggles
+  <b>Playing a Game - <a href="#Hotkeys">Hotkeys</a></b>).
+  However, another alternative is available. Pressing the '\' key (default) toggles
   a command menu dialog as follows:</p>
   <p><img src="graphics/commandmenu.png"></p>
 
@@ -618,7 +618,7 @@
 
   <p>Note: Clicking the `?` at the top right opens this document at the related
   paragraph. This works for almost all dialogs. There is also a hotkey defined
-  for help (see <b><a href="#Hotkeys">Hotkeys</a></b>)).</p>
+  for help (see <b><a href="#Hotkeys">Hotkeys</a></b>).</p>
   </blockquote></br>
 
   <h2><b><a name="Keyboard">Keyboard Layout</a></b></h2>
@@ -655,27 +655,27 @@
     </tr>
 
     <tr>
-      <td>Exit game mode/enter launcher mode</td>
+      <td>Exit game, enter <b><a href="#ROMInfo">ROM Launcher</a></b></td>
       <td>Escape</td>
       <td>Escape</td>
     </tr>
 
     <tr>
-      <td>Enter/exit <a href="#Options"><b>options</b></a> mode</td>
+      <td>Enter/exit <a href="#Options"><b>Options Menu</b></a></td>
       <td>Tab/Escape</td>
       <td>Tab/Escape</td>
     </tr>
 
     <tr>
-      <td>Enter/exit <a href="#CommandMenu"><b>command</b></a> mode</td>
-      <td>Backslash (\)</td>
-      <td>Backslash (\)</td>
+      <td>Enter/exit <a href="#CommandMenu"><b>Command Menu</b></a> </td>
+      <td>Backslash (\)/Escape</td>
+      <td>Backslash (\)/Escape</td>
     </tr>
 
     <tr>
-      <td>Enter/exit debugger</td>
-      <td>Backquote (`)</td>
-      <td>Backquote (`)</td>
+      <td>Enter/exit <a href="debugger.html"><b>Debugger</b></a></td>
+      <td>Backquote (`)/Escape</td>
+      <td>Backquote (`)/Escape</td>
     </tr>
 
     <tr>
@@ -2122,7 +2122,7 @@
       <td>Shift + T to enter, Shift + T/Escape to exit and continue with emulation</td>
     </tr>
     <tr>
-      <td>Playback the <a href="#TimeMachine"><b>Time Machine</b></a> from current state (without sound, from the TM dialog only)</td>
+      <td>Playback the <a href="#TimeMachine"><b>Time Machine</b></a> from current state (from the TM dialog only)</td>
       <td>Space</td>
       <td>Space</td>
     </tr>