diff --git a/src/burn/drv/pre90s/d_megasys1.cpp b/src/burn/drv/pre90s/d_megasys1.cpp
index e5976bf17..3591e0035 100644
--- a/src/burn/drv/pre90s/d_megasys1.cpp
+++ b/src/burn/drv/pre90s/d_megasys1.cpp
@@ -1415,46 +1415,46 @@ STDDIPINFO(Peekaboo)
 
 static struct BurnDIPInfo InyourfaDIPList[]=
 {
-	{0x12, 0xff, 0xff, 0xff, NULL			},
-	{0x13, 0xff, 0xff, 0xff, NULL			},
+	{0x14, 0xff, 0xff, 0xff, NULL			},
+	{0x15, 0xff, 0xff, 0xff, NULL			},
 
 	{0   , 0xfe, 0   ,    4, "Game Time"		},
-	{0x12, 0x01, 0x03, 0x02, "00:50"		},
-	{0x12, 0x01, 0x03, 0x01, "01:00"		},
-	{0x12, 0x01, 0x03, 0x03, "01:10"		},
-	{0x12, 0x01, 0x03, 0x00, "01:20"		},
+	{0x14, 0x01, 0x03, 0x02, "00:50"		},
+	{0x14, 0x01, 0x03, 0x01, "01:00"		},
+	{0x14, 0x01, 0x03, 0x03, "01:10"		},
+	{0x14, 0x01, 0x03, 0x00, "01:20"		},
 
 	{0   , 0xfe, 0   ,    2, "Flip Screen"		},
-	{0x12, 0x01, 0x80, 0x80, "Off"			},
-	{0x12, 0x01, 0x80, 0x00, "On"			},
+	{0x14, 0x01, 0x80, 0x80, "Off"			},
+	{0x14, 0x01, 0x80, 0x00, "On"			},
 
 	{0   , 0xfe, 0   ,    8, "Coin A"		},
-	{0x13, 0x01, 0x07, 0x04, "3 Coins 1 Credits"	},
-	{0x13, 0x01, 0x07, 0x02, "2 Coins 1 Credits"	},
-	{0x13, 0x01, 0x07, 0x07, "1 Coin  1 Credits"	},
-	{0x13, 0x01, 0x07, 0x03, "1 Coin  2 Credits"	},
-	{0x13, 0x01, 0x07, 0x05, "1 Coin  3 Credits"	},
-	{0x13, 0x01, 0x07, 0x01, "1 Coin  4 Credits"	},
-	{0x13, 0x01, 0x07, 0x06, "1 Coin  5 Credits"	},
-	{0x13, 0x01, 0x07, 0x00, "Free Play"		},
+	{0x15, 0x01, 0x07, 0x04, "3 Coins 1 Credits"	},
+	{0x15, 0x01, 0x07, 0x02, "2 Coins 1 Credits"	},
+	{0x15, 0x01, 0x07, 0x07, "1 Coin  1 Credits"	},
+	{0x15, 0x01, 0x07, 0x03, "1 Coin  2 Credits"	},
+	{0x15, 0x01, 0x07, 0x05, "1 Coin  3 Credits"	},
+	{0x15, 0x01, 0x07, 0x01, "1 Coin  4 Credits"	},
+	{0x15, 0x01, 0x07, 0x06, "1 Coin  5 Credits"	},
+	{0x15, 0x01, 0x07, 0x00, "Free Play"		},
 
 	{0   , 0xfe, 0   ,    8, "Coin B"		},
-	{0x13, 0x01, 0x38, 0x00, "4 Coins 1 Credits"	},
-	{0x13, 0x01, 0x38, 0x20, "3 Coins 1 Credits"	},
-	{0x13, 0x01, 0x38, 0x10, "2 Coins 1 Credits"	},
-	{0x13, 0x01, 0x38, 0x38, "1 Coin  1 Credits"	},
-	{0x13, 0x01, 0x38, 0x18, "1 Coin  2 Credits"	},
-	{0x13, 0x01, 0x38, 0x28, "1 Coin  3 Credits"	},
-	{0x13, 0x01, 0x38, 0x08, "1 Coin  4 Credits"	},
-	{0x13, 0x01, 0x38, 0x30, "1 Coin  5 Credits"	},
+	{0x15, 0x01, 0x38, 0x00, "4 Coins 1 Credits"	},
+	{0x15, 0x01, 0x38, 0x20, "3 Coins 1 Credits"	},
+	{0x15, 0x01, 0x38, 0x10, "2 Coins 1 Credits"	},
+	{0x15, 0x01, 0x38, 0x38, "1 Coin  1 Credits"	},
+	{0x15, 0x01, 0x38, 0x18, "1 Coin  2 Credits"	},
+	{0x15, 0x01, 0x38, 0x28, "1 Coin  3 Credits"	},
+	{0x15, 0x01, 0x38, 0x08, "1 Coin  4 Credits"	},
+	{0x15, 0x01, 0x38, 0x30, "1 Coin  5 Credits"	},
 
 	{0   , 0xfe, 0   ,    2, "Demo Sounds"		},
-	{0x13, 0x01, 0x40, 0x40, "On"			},
-	{0x13, 0x01, 0x40, 0x00, "Off"			},
+	{0x15, 0x01, 0x40, 0x40, "On"			},
+	{0x15, 0x01, 0x40, 0x00, "Off"			},
 
 	{0   , 0xfe, 0   ,    2, "Freeze Screen (Cheat)"},
-	{0x13, 0x01, 0x80, 0x80, "Off"			},
-	{0x13, 0x01, 0x80, 0x00, "On"			},
+	{0x15, 0x01, 0x80, 0x80, "Off"			},
+	{0x15, 0x01, 0x80, 0x00, "On"			},
 };
 
 STDDIPINFO(Inyourfa)
@@ -3358,7 +3358,7 @@ static INT32 System1AFrame()
 	INT32 nSegment;
 	INT32 nInterleave = 262;
 	INT32 nSoundBufferPos = 0;
-	INT32 nCyclesTotal[2] = { ((tshingen) ? 8000000 : 6000000) / 60, 7000000 / 60 };
+	INT32 nCyclesTotal[2] = { ((tshingen) ? 8000000 : 6000000) / 56, 7000000 / 56 };
 	INT32 nCyclesDone[2] = { 0, 0 };
 
 	for (INT32 i = 0; i < nInterleave; i++)
@@ -6036,22 +6036,15 @@ static INT32 inyourfaInit()
 {
 	INT32 nRet = SystemInit(0xA, phantasm_rom_decode);
 
-	if (nRet == 0)
-	{
-		//memset (DrvGfxROM[1] + 0xc0000, 0xf, 0x40000);
-
-		//install_mcu_protection(mcu_config_type2, 0x2f000); // necessary?
-	}
-
 	return nRet;
 }
 
 struct BurnDriver BurnDrvInyourfa = {
 	"inyourfa", NULL, NULL, NULL, "1991",
-	"In Your Face (World, prototype)\0", NULL, "Jaleco", "Mega System 1",
+	"In Your Face (US, prototype)\0", NULL, "Jaleco", "Mega System 1",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_PROTOTYPE, 2, HARDWARE_MISC_POST90S, GBF_SPORTSMISC, 0,
-	NULL, inyourfaRomInfo, inyourfaRomName, NULL, NULL, CommonInputInfo, InyourfaDIPInfo,
+	NULL, inyourfaRomInfo, inyourfaRomName, NULL, NULL, Common3ButtonInputInfo, InyourfaDIPInfo,
 	inyourfaInit, DrvExit, System1AFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	256, 224, 4, 3
 };