diff --git a/zsnes/src/cpu/dma.asm b/zsnes/src/cpu/dma.asm
index b9ff8bb2..bb72948f 100644
--- a/zsnes/src/cpu/dma.asm
+++ b/zsnes/src/cpu/dma.asm
@@ -393,6 +393,9 @@ ALIGN32
 .writeaddr dd 0
 .cebx      dd 0
 
+%macro TestDMA 0
+%endmacro
+
 ; DMA enable register
 ; use dmadata for input on dma
 NEWSYM reg420Bw
@@ -404,41 +407,49 @@ NEWSYM reg420Bw
     mov esi,dmadata
     test al,01h
     jz .notransa
+    TestDMA
     call transdma
 .notransa
     add esi,16
     test al,02h
     jz .notransb
+    TestDMA
     call transdma
 .notransb
     add esi,16
     test al,04h
     jz .notransc
+    TestDMA
     call transdma
 .notransc
     add esi,16
     test al,08h
     jz .notransd
+    TestDMA
     call transdma
 .notransd
     add esi,16
     test al,10h
     jz .notranse
+    TestDMA
     call transdma
 .notranse
     add esi,16
     test al,20h
     jz .notransf
+    TestDMA
     call transdma
 .notransf
     add esi,16
     test al,40h
     jz .notransg
+    TestDMA
     call transdma
 .notransg
     add esi,16
     test al,80h
     jz .notransh
+    TestDMA
     call transdma
 .notransh
     pop edx
@@ -762,6 +773,7 @@ NEWSYM hdmastartsc, db 0
 NEWSYM hdmarestart, db 0
 
 NEWSYM reg420Cw
+
     mov [curhdma],al
     mov bx,[resolutn]
     cmp word[curypos],bx
diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index 68532590..22fd134a 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -2678,6 +2678,7 @@ NEWSYM cpuover
     jmp execloop.startagain
 
 .nmi
+    mov byte[irqon],80h
     mov byte[doirqnext],0
     inc dword[NetSent]
     cmp byte[yesoutofmemory],1
@@ -4373,6 +4374,7 @@ NEWSYM execsingle
     jmp dword near [edi+ebx*4]
 
 .nmi
+    mov byte[irqon],80h
     cmp byte[C4Enable],0
     je .noC4
     call C4VBlank
diff --git a/zsnes/src/cpu/memory.asm b/zsnes/src/cpu/memory.asm
index 383d4dd4..324d82ba 100644
--- a/zsnes/src/cpu/memory.asm
+++ b/zsnes/src/cpu/memory.asm
@@ -2964,7 +2964,7 @@ NEWSYM BWUsed, db 0
 .shift
     cmp byte[SA1Status],0
     je .nosa1
-    mov byte[debstop3],1
+;    mov byte[debstop3],1
     ; value of 8Fh
     test byte[SA1Overflow+1],80h
     jnz .2bit
diff --git a/zsnes/src/cpu/s65816d.inc b/zsnes/src/cpu/s65816d.inc
index 02439390..df6c12eb 100644
--- a/zsnes/src/cpu/s65816d.inc
+++ b/zsnes/src/cpu/s65816d.inc
@@ -28,9 +28,10 @@ EXTSYM Sflagnz, Sflago, Sflagc,dmadata
 ;*******************************************************
 ; Flag Setting Macros
 ;*******************************************************
-
+EXTSYM debuggeron
 
 %macro endloop 0
+    call sa1debug
     mov bl,[esi]
     inc esi
     sub dh,[cpucycle+ebx]