diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp
index b09989193..ba336ced7 100644
--- a/src/engine/platform/genesis.cpp
+++ b/src/engine/platform/genesis.cpp
@@ -723,6 +723,7 @@ void DivPlatformGenesis::toggleRegisterDump(bool enable) {
 }
 
 void* DivPlatformGenesis::getChanState(int ch) {
+  if (ch>5) return psg.getChanState(ch-6);
   return &chan[ch];
 }
 
diff --git a/src/gui/debug.cpp b/src/gui/debug.cpp
index 01988959b..dac5f6d5d 100644
--- a/src/gui/debug.cpp
+++ b/src/gui/debug.cpp
@@ -17,47 +17,68 @@
 #include "../engine/platform/amiga.h"
 #include "../engine/platform/dummy.h"
 
+#define GENESIS_DEBUG \
+  DivPlatformGenesis::Channel* ch=(DivPlatformGenesis::Channel*)data; \
+  ImGui::Text("> YM2612"); \
+  ImGui::Text("- freqHL: %.2x%.2x",ch->freqH,ch->freqL); \
+  ImGui::Text("* freq: %d",ch->freq); \
+  ImGui::Text(" - base: %d",ch->baseFreq); \
+  ImGui::Text(" - pitch: %d",ch->pitch); \
+  ImGui::Text("- note: %d",ch->note); \
+  ImGui::Text("- ins: %d",ch->ins); \
+  ImGui::Text("- vol: %.2x",ch->vol); \
+  ImGui::Text("- outVol: %.2x",ch->outVol); \
+  ImGui::Text("- pan: %x",ch->pan); \
+  ImGui::TextColored(ch->active?colorOn:colorOff,">> Active"); \
+  ImGui::TextColored(ch->insChanged?colorOn:colorOff,">> InsChanged"); \
+  ImGui::TextColored(ch->freqChanged?colorOn:colorOff,">> FreqChanged"); \
+  ImGui::TextColored(ch->keyOn?colorOn:colorOff,">> KeyOn"); \
+  ImGui::TextColored(ch->keyOff?colorOn:colorOff,">> KeyOff"); \
+  ImGui::TextColored(ch->portaPause?colorOn:colorOff,">> PortaPause"); \
+  ImGui::TextColored(ch->furnaceDac?colorOn:colorOff,">> FurnaceDAC"); \
+  ImGui::TextColored(ch->inPorta?colorOn:colorOff,">> InPorta");
+
+#define SMS_DEBUG \
+  DivPlatformSMS::Channel* ch=(DivPlatformSMS::Channel*)data; \
+  ImGui::Text("> SMS"); \
+  ImGui::Text("* freq: %d",ch->freq); \
+  ImGui::Text(" - base: %d",ch->baseFreq); \
+  ImGui::Text(" - pitch: %d",ch->pitch); \
+  ImGui::Text("- note: %d",ch->note); \
+  ImGui::Text("- ins: %d",ch->ins); \
+  ImGui::Text("- vol: %.2x",ch->vol); \
+  ImGui::Text("- outVol: %.2x",ch->outVol); \
+  ImGui::TextColored(ch->active?colorOn:colorOff,">> Active"); \
+  ImGui::TextColored(ch->insChanged?colorOn:colorOff,">> InsChanged"); \
+  ImGui::TextColored(ch->freqChanged?colorOn:colorOff,">> FreqChanged"); \
+  ImGui::TextColored(ch->keyOn?colorOn:colorOff,">> KeyOn"); \
+  ImGui::TextColored(ch->keyOff?colorOn:colorOff,">> KeyOff");
+
 void putDispatchChan(void* data, int chanNum, int type) {
   ImVec4 colorOn=ImVec4(1.0f,1.0f,0.0f,1.0f);
   ImVec4 colorOff=ImVec4(0.3f,0.3f,0.3f,1.0f);
   switch (type) {
-    case DIV_SYSTEM_GENESIS: {
-      DivPlatformGenesis::Channel* ch=(DivPlatformGenesis::Channel*)data;
-      ImGui::Text("> Genesis");
-      ImGui::Text("- freqHL: %.2x%.2x",ch->freqH,ch->freqL);
-      ImGui::Text("* freq: %d",ch->freq);
-      ImGui::Text(" - base: %d",ch->baseFreq);
-      ImGui::Text(" - pitch: %d",ch->pitch);
-      ImGui::Text("- note: %d",ch->note);
-      ImGui::Text("- ins: %d",ch->ins);
-      ImGui::Text("- vol: %.2x",ch->vol);
-      ImGui::Text("- outVol: %.2x",ch->outVol);
-      ImGui::Text("- pan: %x",ch->pan);
-      ImGui::TextColored(ch->active?colorOn:colorOff,">> Active");
-      ImGui::TextColored(ch->insChanged?colorOn:colorOff,">> InsChanged");
-      ImGui::TextColored(ch->freqChanged?colorOn:colorOff,">> FreqChanged");
-      ImGui::TextColored(ch->keyOn?colorOn:colorOff,">> KeyOn");
-      ImGui::TextColored(ch->keyOff?colorOn:colorOff,">> KeyOff");
-      ImGui::TextColored(ch->portaPause?colorOn:colorOff,">> PortaPause");
-      ImGui::TextColored(ch->furnaceDac?colorOn:colorOff,">> FurnaceDAC");
-      ImGui::TextColored(ch->inPorta?colorOn:colorOff,">> InPorta");
+    case DIV_SYSTEM_GENESIS:
+    case DIV_SYSTEM_YM2612: {
+      if (chanNum>5) {
+        SMS_DEBUG;
+      } else {
+        GENESIS_DEBUG;
+      }
+      break;
+    }
+    case DIV_SYSTEM_GENESIS_EXT: {
+      if (chanNum>8) {
+        SMS_DEBUG;
+      } else if (chanNum>=2 && chanNum<=5) {
+        // TODO ext ch 3 debug
+      } else {
+        GENESIS_DEBUG;
+      }
       break;
     }
     case DIV_SYSTEM_SMS: {
-      DivPlatformSMS::Channel* ch=(DivPlatformSMS::Channel*)data;
-      ImGui::Text("> SMS");
-      ImGui::Text("* freq: %d",ch->freq);
-      ImGui::Text(" - base: %d",ch->baseFreq);
-      ImGui::Text(" - pitch: %d",ch->pitch);
-      ImGui::Text("- note: %d",ch->note);
-      ImGui::Text("- ins: %d",ch->ins);
-      ImGui::Text("- vol: %.2x",ch->vol);
-      ImGui::Text("- outVol: %.2x",ch->outVol);
-      ImGui::TextColored(ch->active?colorOn:colorOff,">> Active");
-      ImGui::TextColored(ch->insChanged?colorOn:colorOff,">> InsChanged");
-      ImGui::TextColored(ch->freqChanged?colorOn:colorOff,">> FreqChanged");
-      ImGui::TextColored(ch->keyOn?colorOn:colorOff,">> KeyOn");
-      ImGui::TextColored(ch->keyOff?colorOn:colorOff,">> KeyOff");
+      SMS_DEBUG;
       break;
     }
     case DIV_SYSTEM_GB: {
@@ -165,18 +186,19 @@ void putDispatchChan(void* data, int chanNum, int type) {
       ImGui::TextColored(ch->sync?colorOn:colorOff,">> Sync");
       break;
     }
-    case DIV_SYSTEM_ARCADE: {
+    case DIV_SYSTEM_ARCADE:
+    case DIV_SYSTEM_YM2151: {
       DivPlatformArcade::Channel* ch=(DivPlatformArcade::Channel*)data;
-      ImGui::Text("> Arcade");
+      ImGui::Text("> YM2151");
       ImGui::Text("- freqHL: %.2x%.2x",ch->freqH,ch->freqL);
       ImGui::Text("* freq: %d",ch->freq);
       ImGui::Text(" - base: %d",ch->baseFreq);
       ImGui::Text(" - pitch: %d",ch->pitch);
-      //ImGui::Text("- note: %d",ch->note);
+      ImGui::Text("- note: %d",ch->note);
       ImGui::Text("- ins: %d",ch->ins);
       ImGui::Text("- KOnCycles: %d",ch->konCycles);
       ImGui::Text("- vol: %.2x",ch->vol);
-       //ImGui::Text("- outVol: %.2x",ch->outVol);
+      ImGui::Text("- outVol: %.2x",ch->outVol);
       ImGui::Text("- chVolL: %.2x",ch->chVolL);
       ImGui::Text("- chVolR: %.2x",ch->chVolR);
       ImGui::Text("* PCM:");
@@ -192,11 +214,11 @@ void putDispatchChan(void* data, int chanNum, int type) {
       ImGui::TextColored(ch->keyOff?colorOn:colorOff,">> KeyOff");
       ImGui::TextColored(ch->portaPause?colorOn:colorOff,">> PortaPause");
       ImGui::TextColored(ch->furnacePCM?colorOn:colorOff,">> FurnacePCM");
-      //ImGui::TextColored(ch->inPorta?colorOn:colorOff,">> InPorta");
+      ImGui::TextColored(ch->inPorta?colorOn:colorOff,">> InPorta");
       break;
     }
     default:
       ImGui::Text("Unknown system! Help!");
       break;
   }
-}
\ No newline at end of file
+}