diff --git a/doc/notes.txt b/doc/notes.txt
index b4c3e3f9..32efc55b 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -13,7 +13,6 @@ TODO:
 - asm: support macro expansion
 - multiple breakpoints, expression breakpoints
 - watchpoints
-- MAME single step (?)
 - step over (line, instruction)
 - slowdown beam for all platforms?
 - show errors in list (maybe window list?)
@@ -384,6 +383,9 @@ Emulator Lib
   - VCS
   - NES
   - MAME
+- MAME
+  - debugging?
+  - kbd instructions don't work
 
 Markdown (showdown) interface
 - add code patches to files
diff --git a/index.html b/index.html
index 21e6869b..e1358f4f 100644
--- a/index.html
+++ b/index.html
@@ -377,6 +377,12 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
       <span class="control-def"><span class="control-key">&#x2190;&#x2191;&#x2193;&#x2192;</span> Joystick</span>
       <span class="control-def"><span class="control-key">Z X C V</span> Buttons</span>
     </div>
+    <div class="emucontrols-atari8 text-center small control-insns" style="display:none">
+      <span class="control-def"><span class="control-key">&#x2190;&#x2191;&#x2193;&#x2192;</span> Joystick</span>
+      <span class="control-def"><span class="control-key">1</span> Start</span>
+      <span class="control-def"><span class="control-key small">Left Ctrl</span> Button 1</span>
+      <span class="control-def"><span class="control-key small">Left Alt</span> Button 2</span>
+    </div>
     <!-- -->
     <div id="emuoverlay" class="emuoverlay" style="display:none">
     </div>
diff --git a/src/common/baseplatform.ts b/src/common/baseplatform.ts
index b98d13a7..c80cabae 100644
--- a/src/common/baseplatform.ts
+++ b/src/common/baseplatform.ts
@@ -325,6 +325,12 @@ export abstract class BaseDebugPlatform extends BasePlatform {
       }
     });
   }
+  runToPC(pc: number) {
+    this.debugTargetClock++;
+    this.runEval((c) => {
+      return c.PC == pc;
+    });
+  }
   runUntilReturn() {
     var SP0 = this.getSP();
     this.runEval( (c:CpuState) : boolean => {