diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs
index 9a8cd459b2..2b61c76db1 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs
@@ -67,7 +67,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 		chip 1 = 512k PRG  (offset 0x20010-0xA000F)
 		*/
 
-		//TODO: fix prg1
+		//TODO: fix reads on prg_mode = 1
 		//TODO: soft reset back to contra = fails
 
 		public int prg_page;
@@ -111,13 +111,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				prg_page = value & 0x0F;
 				prg_mode = value.Bit(5);
 
-				if (addr.Bit(6))
+				if (value.Bit(6))
 				{
-					SetMirrorType(EMirrorType.Horizontal);
+					SetMirrorType(EMirrorType.Vertical);
 				}
 				else
 				{
-					SetMirrorType(EMirrorType.Vertical);
+					SetMirrorType(EMirrorType.Horizontal);
 				}
 			}
 		}
@@ -161,14 +161,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 			contra_mode ^= true;
 			prg_page = 0;
 			prg_mode = false;
-			if (contra_mode)
-			{
-				SetMirrorType(EMirrorType.Vertical);
-			}
-			else
-			{
-				SetMirrorType(EMirrorType.Horizontal);
-			}
+			SetMirrorType(EMirrorType.Vertical);
 		}
 	}
 }
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
index 17da76af97..c136e9a489 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
@@ -74,9 +74,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 			lagged = true;
 			if (resetSignal)
 			{
+				board.NESSoftReset();
 				cpu.NESSoftReset();
 				apu.NESSoftReset();
-				board.NESSoftReset();
 				//need to study what happens to ppu and apu and stuff..
 			}