diff --git a/index.html b/index.html
index 69a3acda..02b48877 100644
--- a/index.html
+++ b/index.html
@@ -304,7 +304,7 @@ 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 small">Space</span> Button</span>
     </div>
-    <div class="emucontrols-nes text-center small control-insns" style="display:none">
+    <div class="emucontrols-nes emucontrols-atari7800 text-center small control-insns" style="display:none">
       <span class="control-def"><span class="control-key">&#x2190;&#x2191;&#x2193;&#x2192;</span> Joypad</span>
       <span class="control-def"><span class="control-key small">Space</span> Button A</span>
       <span class="control-def"><span class="control-key small">Shift</span> Button B</span>
diff --git a/package-lock.json b/package-lock.json
index c5ec4b27..f8f221cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3015,6 +3015,12 @@
         "extsprintf": "^1.2.0"
       }
     },
+    "vgm-parser": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/vgm-parser/-/vgm-parser-0.6.2.tgz",
+      "integrity": "sha512-YenDnwDe9jwTz5MWRQhQwqgSbZ14y2MOiUXBzrDkwSE8T/JX0ugZAMxq6mTXSwz7wSMsof5b1rNL0/i+p5efvw==",
+      "dev": true
+    },
     "w3c-hr-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
diff --git a/package.json b/package.json
index f2f85b4a..e0b7248a 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "pngjs": "^3.4.0",
     "rgbquant": "^1.1.2",
     "typescript": "^3.7.4",
-    "typescript-formatter": "^7.2.2"
+    "typescript-formatter": "^7.2.2",
+    "vgm-parser": "^0.6.2"
   },
   "main": "main.js",
   "directories": {
diff --git a/src/common/baseplatform.ts b/src/common/baseplatform.ts
index 2a7d99f6..e4282d2b 100644
--- a/src/common/baseplatform.ts
+++ b/src/common/baseplatform.ts
@@ -1057,6 +1057,17 @@ export abstract class BaseMachinePlatform<T extends Machine> extends BaseDebugPl
   pause() {
     this.timer.stop();
     this.audio && this.audio.stop();
+    if (this.probeRecorder) {
+      this.probeRecorder.singleFrame = true;
+    }
+  }
+  // so probe views stick around
+  runToVsync() {
+    if (this.probeRecorder) {
+      this.probeRecorder.reset();
+      this.probeRecorder.singleFrame = false;
+    }
+    super.runToVsync();
   }
 
 // TODO: reset target clock counter
@@ -1237,7 +1248,7 @@ export class WASMMachine implements Machine {
     var cpf = 19656; // TODO: pal, const
     if (trap) {
       for (i=0; i<cpf; i++) {
-        if (trap && trap()) {
+        if (trap()) {
           break;
         }
         this.exports.machine_tick(this.sys);
diff --git a/src/ide/ui.ts b/src/ide/ui.ts
index aede2128..b1756805 100644
--- a/src/ide/ui.ts
+++ b/src/ide/ui.ts
@@ -1099,8 +1099,8 @@ function checkRunReady() {
 }
 
 function openRelevantListing(state: EmuState) {
-  // if we clicked on disassembly window, retain it
-  if (lastViewClicked == '#disasm' && projectWindows.getActive() instanceof Views.DisassemblerView) return;
+  // if we clicked on another window, retain it
+  if (lastViewClicked != null) return;
   // search through listings
   var listings = current_project.getListings();
   var bestid = "#disasm";