diff --git a/src/burn/drv/cps3/d_cps3.cpp b/src/burn/drv/cps3/d_cps3.cpp
index a8d884a8f..2fbc019f0 100644
--- a/src/burn/drv/cps3/d_cps3.cpp
+++ b/src/burn/drv/cps3/d_cps3.cpp
@@ -228,7 +228,9 @@ static struct BurnRomInfo sfiiiRomDesc[] = {
 
 	{ "sfiii_usa.29f400.u2",			0x080000, 0xfb172a8e, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 
+#if !defined ROM_VERIFY
 	SFIII_970204_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiii)
@@ -241,7 +243,9 @@ static struct BurnRomInfo sfiiijRomDesc[] = {
 
 	{ "sfiii_japan.29f400.u2",			0x080000, 0x74205250, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	SFIII_970204_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiiij)
@@ -254,7 +258,9 @@ static struct BurnRomInfo sfiiihRomDesc[] = {
 
 	{ "sfiii_hispanic.29f400.u2",		0x080000, 0xd2b3cd48, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 
+#if !defined ROM_VERIFY
 	SFIII_970204_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiiih)
@@ -318,7 +324,9 @@ static struct BurnRomInfo sfiii2RomDesc[] = {
 
 	{ "sfiii2_usa.29f400.u2",			0x080000, 0x75dd72e0, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 					  
+#if !defined ROM_VERIFY
 	SFIII2_970930_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiii2)
@@ -331,7 +339,9 @@ static struct BurnRomInfo sfiii2jRomDesc[] = {
 
 	{ "sfiii2_japan.29f400.u2",			0x080000, 0xfaea0a3e, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	SFIII2_970930_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiii2j)
@@ -403,7 +413,9 @@ static struct BurnRomInfo sfiii3RomDesc[] = {
 
 	{ "sfiii3_euro.29f400.u2",			0x080000, 0x30bbf293, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	SFIII3_990608_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiii3)
@@ -416,7 +428,9 @@ static struct BurnRomInfo sfiii3uRomDesc[] = {
 
 	{ "sfiii3_usa.29f400.u2",			0x080000, 0xecc545c1, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	SFIII3_990608_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiii3u)
@@ -488,7 +502,9 @@ static struct BurnRomInfo sfiii3r1RomDesc[] = {
 
 	{ "sfiii3_euro.29f400.u2",			0x080000, 0x30bbf293, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	SFIII3_990512_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiii3r1)
@@ -501,7 +517,9 @@ static struct BurnRomInfo sfiii3ur1RomDesc[] = {
 
 	{ "sfiii3_usa.29f400.u2",			0x080000, 0xecc545c1, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	SFIII3_990512_FLASH
+#endif
 };
 
 STD_ROM_PICK(sfiii3ur1)
@@ -559,7 +577,9 @@ static struct BurnRomInfo jojoRomDesc[] = {
 
 	{ "jojo_usa.29f400.u2",				0x080000, 0x8d40f7be, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	JOJO_990128_FLASH
+#endif
 };
 
 STD_ROM_PICK(jojo)
@@ -572,7 +592,9 @@ static struct BurnRomInfo jojojRomDesc[] = {
 
 	{ "jojo_japan.29f400.u2",			0x080000, 0x02778f60, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	JOJO_990128_FLASH
+#endif
 };
 
 STD_ROM_PICK(jojoj)
@@ -630,7 +652,9 @@ static struct BurnRomInfo jojor1RomDesc[] = {
 
 	{ "jojo_usa.29f400.u2",				0x080000, 0x8d40f7be, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	JOJO_990108_FLASH
+#endif
 };
 
 STD_ROM_PICK(jojor1)
@@ -643,7 +667,9 @@ static struct BurnRomInfo jojojr1RomDesc[] = {
 
 	{ "jojo_japan.29f400.u2",			0x080000, 0x02778f60, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	JOJO_990108_FLASH
+#endif
 };
 
 STD_ROM_PICK(jojojr1)
@@ -701,7 +727,9 @@ static struct BurnRomInfo jojor2RomDesc[] = {
 
 	{ "jojo_usa.29f400.u2",				0x080000, 0x8d40f7be, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	JOJO_981202_FLASH
+#endif
 };
 
 STD_ROM_PICK(jojor2)
@@ -714,7 +742,9 @@ static struct BurnRomInfo jojojr2RomDesc[] = {
 
 	{ "jojo_japan.29f400.u2",			0x080000, 0x02778f60, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	JOJO_981202_FLASH
+#endif
 };
 
 STD_ROM_PICK(jojojr2)
@@ -778,7 +808,9 @@ static struct BurnRomInfo jojobaRomDesc[] = {
 
 	{ "jojoba_japan.29f400.u2",			0x080000, 0x3085478c, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 					  
+#if !defined ROM_VERIFY
 	JOJOBA_990927_FLASH
+#endif
 };
 
 STD_ROM_PICK(jojoba)
@@ -855,7 +887,9 @@ static struct BurnRomInfo jojobar1RomDesc[] = {
 
 	{ "jojoba_japan.29f400.u2",			0x080000, 0x3085478c, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 					  
+#if !defined ROM_VERIFY
 	JOJOBA_990913_FLASH
+#endif
 };
 
 STD_ROM_PICK(jojobar1)
@@ -922,7 +956,9 @@ static struct BurnRomInfo redearthRomDesc[] = {
 
 	{ "redearth_euro.29f400.u2",		0x080000, 0x02e0f336, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	REDEARTH_961121_FLASH
+#endif
 };
 
 STD_ROM_PICK(redearth)
@@ -935,7 +971,9 @@ static struct BurnRomInfo warzardRomDesc[] = {
 
 	{ "warzard_japan.29f400.u2",		0x080000, 0xf8e2f0c6, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	REDEARTH_961121_FLASH
+#endif
 };
 
 STD_ROM_PICK(warzard)
@@ -976,7 +1014,9 @@ static struct BurnRomInfo redearthr1RomDesc[] = {
 
 	{ "redearth_euro.29f400.u2",		0x080000, 0x02e0f336, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	REDEARTH_961023_FLASH
+#endif
 };
 
 STD_ROM_PICK(redearthr1)
@@ -989,7 +1029,9 @@ static struct BurnRomInfo warzardr1RomDesc[] = {
 
 	{ "warzard_japan.29f400.u2",		 0x080000, 0xf8e2f0c6, BRF_ESS | BRF_BIOS },	// SH-2 Bios
 	
+#if !defined ROM_VERIFY
 	REDEARTH_961023_FLASH
+#endif
 };
 
 STD_ROM_PICK(warzardr1)
diff --git a/src/burn/drv/konami/d_mainevt.cpp b/src/burn/drv/konami/d_mainevt.cpp
index be8c986b9..70d2bb0c1 100644
--- a/src/burn/drv/konami/d_mainevt.cpp
+++ b/src/burn/drv/konami/d_mainevt.cpp
@@ -963,7 +963,7 @@ static INT32 DrvScan(INT32 nAction,INT32 *pnMin)
 // The Main Event (4 Players ver. Y)
 
 static struct BurnRomInfo mainevtRomDesc[] = {
-	{ "799c02.k11",		0x10000, 0xe2e7dbd5, 1 | BRF_PRG | BRF_ESS }, //  0 HD6309 Code
+	{ "799y02.k11",		0x10000, 0xe2e7dbd5, 1 | BRF_PRG | BRF_ESS }, //  0 HD6309 Code
 
 	{ "799c01.f7",		0x08000, 0x447c4c5c, 2 | BRF_PRG | BRF_ESS }, //  1 Z80 Code
 
@@ -1005,7 +1005,7 @@ struct BurnDriver BurnDrvMainevt = {
 // The Main Event (4 Players ver. F)
 
 static struct BurnRomInfo mainevtoRomDesc[] = {
-	{ "799_02.k11",		0x10000, 0xc143596b, 1 | BRF_PRG | BRF_ESS }, //  0 HD6309 Code
+	{ "799f02.k11",		0x10000, 0xc143596b, 1 | BRF_PRG | BRF_ESS }, //  0 HD6309 Code
 
 	{ "799c01.f7",		0x08000, 0x447c4c5c, 2 | BRF_PRG | BRF_ESS }, //  1 Z80 Code
 
diff --git a/src/burn/drv/neogeo/d_neogeo.cpp b/src/burn/drv/neogeo/d_neogeo.cpp
index c5ce74aba..055010ba1 100644
--- a/src/burn/drv/neogeo/d_neogeo.cpp
+++ b/src/burn/drv/neogeo/d_neogeo.cpp
@@ -13289,24 +13289,24 @@ struct BurnDriver BurnDrvkof97pla = {
 // The King of Fighters '97 oroshi plus 2003
 
 static struct BurnRomInfo kof97oroRomDesc[] = {
-	{ "p1",           0x0100000, 0x6DCB2946, 1 | BRF_ESS | BRF_PRG }, //  0 68K code
-	{ "p21",          0x0200000, 0x6E1C4D8C, 1 | BRF_ESS | BRF_PRG }, //  1 
-	{ "p29",          0x0200000, 0x4C7C0221, 1 | BRF_ESS | BRF_PRG }, //  2
+	{ "orochi-p1.bin",  0x0100000, 0x6DCB2946, 1 | BRF_ESS | BRF_PRG }, //  0 68K code
+	{ "orochi-p21.bin", 0x0200000, 0x6E1C4D8C, 1 | BRF_ESS | BRF_PRG }, //  1 
+	{ "orochi-p29.bin", 0x0200000, 0x4C7C0221, 1 | BRF_ESS | BRF_PRG }, //  2
 
-	{ "s1",           0x0020000, 0x4EE2149A, 2 | BRF_GRA },           //  3 Text layer tiles
+	{ "orochi-s1.bin",  0x0020000, 0x4EE2149A, 2 | BRF_GRA },           //  3 Text layer tiles
 
-	{ "c1",           0x1000000, 0xF13E841C, 3 | BRF_GRA },           //  4 Sprite data
-	{ "c2",           0x1000000, 0x2DB1F6D3, 3 | BRF_GRA },           //  5 
-	{ "c51",          0x0200000, 0xA90340CB, 3 | BRF_GRA },           //  6 
-	{ "c61",          0x0200000, 0x188E351A, 3 | BRF_GRA },           //  7 
-	{ "c52",          0x0200000, 0xD4EEC50A, 3 | BRF_GRA },           //  8 
-	{ "c62",          0x0200000, 0x031B1AD5, 3 | BRF_GRA },           //  9 
+	{ "orochi-c1.bin",  0x1000000, 0xF13E841C, 3 | BRF_GRA },           //  4 Sprite data
+	{ "orochi-c2.bin",  0x1000000, 0x2DB1F6D3, 3 | BRF_GRA },           //  5 
+	{ "orochi-c51.bin", 0x0200000, 0xA90340CB, 3 | BRF_GRA },           //  6 
+	{ "orochi-c61.bin", 0x0200000, 0x188E351A, 3 | BRF_GRA },           //  7 
+	{ "orochi-c52.bin", 0x0200000, 0xD4EEC50A, 3 | BRF_GRA },           //  8 
+	{ "orochi-c62.bin", 0x0200000, 0x031B1AD5, 3 | BRF_GRA },           //  9 
 
-	{ "232-m1.m1",    0x0020000, 0x45348747, 4 | BRF_ESS | BRF_PRG }, // 10 Z80 code
+	{ "orochi-m1.bin",  0x0020000, 0x45348747, 4 | BRF_ESS | BRF_PRG }, // 10 Z80 code
 
-	{ "232-v1.v1",    0x0400000, 0x22a2b5b5, 5 | BRF_SND },           // 11 Sound data
-	{ "232-v2.v2",    0x0400000, 0x2304e744, 5 | BRF_SND },           // 12 
-	{ "232-v3.v3",    0x0400000, 0x759eb954, 5 | BRF_SND },           // 13 
+	{ "orochi-v1.bin",  0x0400000, 0x22a2b5b5, 5 | BRF_SND },           // 11 Sound data
+	{ "orochi-v2.bin",  0x0400000, 0x2304e744, 5 | BRF_SND },           // 12 
+	{ "orochi-v3.bin",  0x0400000, 0x759eb954, 5 | BRF_SND },           // 13 
 };
 
 STDROMPICKEXT(kof97oro, kof97oro, neogeo)
diff --git a/src/burn/drv/pst90s/d_nmk16.cpp b/src/burn/drv/pst90s/d_nmk16.cpp
index 07e1f03a7..3a8fdcc68 100644
--- a/src/burn/drv/pst90s/d_nmk16.cpp
+++ b/src/burn/drv/pst90s/d_nmk16.cpp
@@ -5673,12 +5673,12 @@ static void decode_tdragonb()
 // Task Force Harrier
 
 static struct BurnRomInfo tharrierRomDesc[] = {
-	{ "2",			0x020000, 0x78923aaa, 1 | BRF_PRG | BRF_ESS }, //  0 68k code
-	{ "3",			0x020000, 0x99cea259, 1 | BRF_PRG | BRF_ESS }, //  1
+	{ "2.bin",		0x020000, 0xf3887a44, 1 | BRF_PRG | BRF_ESS }, //  0 68k code
+	{ "3.bin",		0x020000, 0x65c247f6, 1 | BRF_PRG | BRF_ESS }, //  1
 
 	{ "12",			0x010000, 0xb959f837, 2 | BRF_PRG | BRF_ESS }, //  2 Z80 code
 
-	{ "1",			0x010000, 0xc7402e4a, 3 | BRF_GRA },           //  3 Characters
+	{ "1.bin",		0x010000, 0x005c26c3, 3 | BRF_GRA },           //  3 Characters
 
 	{ "89050-4",		0x080000, 0x64d7d687, 4 | BRF_GRA },           //  4 Tiles
 
@@ -5751,24 +5751,23 @@ static INT32 TharrierInit()
 
 struct BurnDriver BurnDrvTharrier = {
 	"tharrier", NULL, NULL, NULL, "1989",
-	"Task Force Harrier\0", NULL, "UPL (American Sammy license)", "NMK16",
+	"Task Force Harrier\0", NULL, "UPL", "NMK16",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_PRE90S, GBF_VERSHOOT, 0,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_PRE90S, GBF_VERSHOOT, 0,
 	NULL, tharrierRomInfo, tharrierRomName, NULL, NULL, TharrierInputInfo, TharrierDIPInfo,
 	TharrierInit, DrvExit, DrvFrame, TharrierDraw, NULL, NULL, 0x200,
 	224, 256, 3, 4
 };
 
+// Task Force Harrier (US?)
 
-// Task Force Harrier (Japan)
-
-static struct BurnRomInfo tharrierjRomDesc[] = {
-	{ "2.bin",		0x020000, 0xf3887a44, 1 | BRF_PRG | BRF_ESS }, //  0 68k code
-	{ "3.bin",		0x020000, 0x65c247f6, 1 | BRF_PRG | BRF_ESS }, //  1
+static struct BurnRomInfo tharrieruRomDesc[] = {
+	{ "2",			0x020000, 0x78923aaa, 1 | BRF_PRG | BRF_ESS }, //  0 68k code
+	{ "3",			0x020000, 0x99cea259, 1 | BRF_PRG | BRF_ESS }, //  1
 
 	{ "12",			0x010000, 0xb959f837, 2 | BRF_PRG | BRF_ESS }, //  2 Z80 code
 
-	{ "1.bin",		0x010000, 0x005c26c3, 3 | BRF_GRA },           //  3 Characters
+	{ "1",			0x010000, 0xc7402e4a, 3 | BRF_GRA },           //  3 Characters
 
 	{ "89050-4",		0x080000, 0x64d7d687, 4 | BRF_GRA },           //  4 Tiles
 
@@ -5787,15 +5786,15 @@ static struct BurnRomInfo tharrierjRomDesc[] = {
 	{ "26.bpr",		0x000020, 0x0cbfb33e, 0 | BRF_OPT },           // 14
 };
 
-STD_ROM_PICK(tharrierj)
-STD_ROM_FN(tharrierj)
+STD_ROM_PICK(tharrieru)
+STD_ROM_FN(tharrieru)
 
-struct BurnDriver BurnDrvTharrierj = {
-	"tharrierj", "tharrier", NULL, NULL, "1989",
-	"Task Force Harrier (Japan)\0", NULL, "UPL", "NMK16",
+struct BurnDriver BurnDrvTharrieru = {
+	"tharrieru", "tharrier", NULL, NULL, "1989",
+	"Task Force Harrier (US?)\0", NULL, "UPL (American Sammy license)", "NMK16",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_PRE90S, GBF_VERSHOOT, 0,
-	NULL, tharrierjRomInfo, tharrierjRomName, NULL, NULL, TharrierInputInfo, TharrierDIPInfo,
+	NULL, tharrieruRomInfo, tharrieruRomName, NULL, NULL, TharrierInputInfo, TharrierDIPInfo,
 	TharrierInit, DrvExit, DrvFrame, TharrierDraw, NULL, NULL, 0x200,
 	224, 256, 3, 4
 };
diff --git a/src/burn/drv/taito/d_arkanoid.cpp b/src/burn/drv/taito/d_arkanoid.cpp
index 58648973a..b00f813be 100644
--- a/src/burn/drv/taito/d_arkanoid.cpp
+++ b/src/burn/drv/taito/d_arkanoid.cpp
@@ -1414,10 +1414,10 @@ STD_ROM_PICK(arkatour)
 STD_ROM_FN(arkatour)
 
 struct BurnDriver BurnDrvarkatour = {
-	"arkatour", "arkanoid", NULL, NULL, "1987",
+	"arkatour", NULL, NULL, NULL, "1987",
 	"Tournament Arkanoid (US)\0", NULL, "Taito America Corporation (Romstar license)", "Arkanoid",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_TAITO_MISC, GBF_BREAKOUT, 0,
+	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_TAITO_MISC, GBF_BREAKOUT, 0,
 	NULL, arkatourRomInfo, arkatourRomName, NULL, NULL, DrvInputInfo, arkanoidDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200,
 	224, 256, 3, 4
diff --git a/src/burn/drv/taito/d_bublbobl.cpp b/src/burn/drv/taito/d_bublbobl.cpp
index 173b91087..bf65dd089 100644
--- a/src/burn/drv/taito/d_bublbobl.cpp
+++ b/src/burn/drv/taito/d_bublbobl.cpp
@@ -650,9 +650,10 @@ static struct BurnRomInfo Boblbobl2RomDesc[] = {
 	{ "a78-14.17",     0x08000, 0x7b5369a8, BRF_GRA },	     //  8
 	{ "gfx10.bin",     0x10000, 0xd370f499, BRF_GRA },	     //  9
 	{ "gfx11.bin",     0x10000, 0x76f2b367, BRF_GRA },	     //  10
-	{ "a78-20.35",     0x08000, 0x9ef863ad, BRF_GRA },	     //  11
+	{ "a78-19.34",     0x08000, 0x66e9438c, BRF_GRA },	     //  11
+	{ "a78-20.35",     0x08000, 0x9ef863ad, BRF_GRA },	     //  12
 
-	{ "a71-25.41",     0x00100, 0x2d0f8545, BRF_GRA },	     //  12	PROMs
+	{ "a71-25.41",     0x00100, 0x2d0f8545, BRF_GRA },	     //  13	PROMs
 };
 
 STD_ROM_PICK(Boblbobl2)
@@ -1892,14 +1893,15 @@ static INT32 Boblbobl2Callback()
 	nRet = BurnLoadRom(DrvTempRom + 0x10000,  6, 1); if (nRet != 0) return 1;
 	nRet = BurnLoadRom(DrvTempRom + 0x20000,  7, 1); if (nRet != 0) return 1;
 	nRet = BurnLoadRom(DrvTempRom + 0x28000,  8, 1); if (nRet != 0) return 1;
-	nRet = BurnLoadRom(DrvTempRom + 0x50000,  9, 1); if (nRet != 0) return 1;
-	nRet = BurnLoadRom(DrvTempRom + 0x60000, 10, 1); if (nRet != 0) return 1;
-	nRet = BurnLoadRom(DrvTempRom + 0x68000, 11, 1); if (nRet != 0) return 1;
+	nRet = BurnLoadRom(DrvTempRom + 0x40000,  9, 1); if (nRet != 0) return 1;
+	nRet = BurnLoadRom(DrvTempRom + 0x50000, 10, 1); if (nRet != 0) return 1;
+	nRet = BurnLoadRom(DrvTempRom + 0x60000, 11, 1); if (nRet != 0) return 1;
+	nRet = BurnLoadRom(DrvTempRom + 0x68000, 12, 1); if (nRet != 0) return 1;
 	for (INT32 i = 0; i < 0x80000; i++) DrvTempRom[i] ^= 0xff;
 	GfxDecode(0x4000, 4, 8, 8, TilePlaneOffsets, TileXOffsets, TileYOffsets, 0x80, DrvTempRom, DrvTiles);
 	
 	// Load the PROM
-	nRet = BurnLoadRom(DrvProm + 0x00000,  12, 1); if (nRet != 0) return 1;
+	nRet = BurnLoadRom(DrvProm + 0x00000,  13, 1); if (nRet != 0) return 1;
 	
 	BurnFree(DrvTempRom);
 	
diff --git a/src/burn/drv/taito/d_taitoz.cpp b/src/burn/drv/taito/d_taitoz.cpp
index 1d7d75cf7..78f865980 100644
--- a/src/burn/drv/taito/d_taitoz.cpp
+++ b/src/burn/drv/taito/d_taitoz.cpp
@@ -1192,6 +1192,41 @@ static struct BurnDIPInfo EnforceDIPList[]=
 
 STDDIPINFO(Enforce)
 
+static struct BurnDIPInfo EnforcejDIPList[]=
+{
+	// Default Values
+	{0x0c, 0xff, 0xff, 0xff, NULL                             },
+	{0x0d, 0xff, 0xff, 0xef, NULL                             },
+	
+	// Dip 1
+	{0   , 0xfe, 0   , 2   , "Service Mode"                   },
+	{0x0c, 0x01, 0x04, 0x04, "Off"                            },
+	{0x0c, 0x01, 0x04, 0x00, "On"                             },
+	
+	{0   , 0xfe, 0   , 2   , "Demo Sounds"                    },
+	{0x0c, 0x01, 0x08, 0x00, "Off"                            },
+	{0x0c, 0x01, 0x08, 0x08, "On"                             },
+	
+	{0   , 0xfe, 0   , 4   , "Coin A"                         },
+	{0x0c, 0x01, 0x30, 0x10, "2 Coins 1 Credit"               },
+	{0x0c, 0x01, 0x30, 0x30, "1 Coin  1 Credit"               },
+	{0x0c, 0x01, 0x30, 0x00, "2 Coins 3 Credits"              },
+	{0x0c, 0x01, 0x30, 0x20, "1 Coin  2 Credits"              },
+	
+	{0   , 0xfe, 0   , 4   , "Coin B"                         },
+	{0x0c, 0x01, 0xc0, 0x40, "2 Coins 1 Credit"               },
+	{0x0c, 0x01, 0xc0, 0xc0, "1 Coin  1 Credit"               },
+	{0x0c, 0x01, 0xc0, 0x00, "2 Coins 3 Credits"              },
+	{0x0c, 0x01, 0xc0, 0x80, "1 Coin  2 Credits"              },
+	
+	// Dip 2
+	{0   , 0xfe, 0   , 2   , "Background Scenery"             },
+	{0x0d, 0x01, 0x10, 0x10, "Crazy Scolling"                 },
+	{0x0d, 0x01, 0x10, 0x00, "Normal"                         },
+};
+
+STDDIPINFO(Enforcej)
+
 static struct BurnDIPInfo NightstrDIPList[]=
 {
 	// Default Values
@@ -2217,10 +2252,10 @@ STD_ROM_PICK(Contcircua)
 STD_ROM_FN(Contcircua)
 
 static struct BurnRomInfo DblaxleRomDesc[] = {
-	{ "c78-41-1.2",    0x020000, 0xcf297fe4, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "c78-43-1.4",    0x020000, 0x38a8bad6, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "c78-42-1.3",    0x020000, 0x4124ab2b, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "c78-44-1.5",    0x020000, 0x50a55b6e, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_49-1.2",    0x020000, 0xa6f0c631, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_51-1.4",    0x020000, 0xef24e83b, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_50-1.3",    0x020000, 0x8b0440f4, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_53-1.5",    0x020000, 0x2bb91763, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	
 	{ "c78-30-1.35",   0x020000, 0x026aac18, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
 	{ "c78-31-1.36",   0x020000, 0x67ce23e8, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
@@ -2254,11 +2289,49 @@ static struct BurnRomInfo DblaxleRomDesc[] = {
 STD_ROM_PICK(Dblaxle)
 STD_ROM_FN(Dblaxle)
 
+static struct BurnRomInfo DblaxleuRomDesc[] = {
+	{ "c78_41-1.2",    0x020000, 0xcf297fe4, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_43-1.4",    0x020000, 0x38a8bad6, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_42-1.3",    0x020000, 0x4124ab2b, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_44-1.5",    0x020000, 0x50a55b6e, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	
+	{ "c78-30-1.35",   0x020000, 0x026aac18, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
+	{ "c78-31-1.36",   0x020000, 0x67ce23e8, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
+	
+	{ "c78-34.c42",    0x020000, 0xf2186943, BRF_ESS | BRF_PRG | TAITO_Z80ROM1 },
+	
+	{ "c78-10.12",     0x080000, 0x44b1897c, BRF_GRA | TAITO_CHARS_BYTESWAP },
+	{ "c78-11.11",     0x080000, 0x7db3d4a3, BRF_GRA | TAITO_CHARS_BYTESWAP },
+	
+	{ "c78-08.25",     0x100000, 0x6c725211, BRF_GRA | TAITO_SPRITESA_BYTESWAP32 },
+	{ "c78-07.33",     0x100000, 0x9da00d5b, BRF_GRA | TAITO_SPRITESA_BYTESWAP32 },
+	{ "c78-06.23",     0x100000, 0x8309e91b, BRF_GRA | TAITO_SPRITESA_BYTESWAP32 },
+	{ "c78-05.31",     0x100000, 0x90001f68, BRF_GRA | TAITO_SPRITESA_BYTESWAP32 },
+	
+	{ "c78-09.12",     0x080000, 0x0dbde6f5, BRF_GRA | TAITO_ROAD },
+	
+	{ "c78-04.3",      0x080000, 0xcc1aa37c, BRF_GRA | TAITO_SPRITEMAP },
+	
+	{ "c78-12.33",     0x100000, 0xb0267404, BRF_SND | TAITO_YM2610A },
+	{ "c78-13.46",     0x080000, 0x1b363aa2, BRF_SND | TAITO_YM2610A },
+	
+	{ "c78-14.31",     0x080000, 0x9cad4dfb, BRF_SND | TAITO_YM2610B },
+	
+	{ "c78-25.15",     0x010000, 0x7245a6f6, BRF_OPT },
+	{ "c78-15.22",     0x000100, 0xfbf81f30, BRF_OPT },
+	{ "c78-21.74",     0x000100, 0x2926bf27, BRF_OPT },
+	{ "c84-10.16",     0x000400, 0x643e8bfc, BRF_OPT },
+	{ "c84-11.17",     0x000400, 0x10728853, BRF_OPT },
+};
+
+STD_ROM_PICK(Dblaxleu)
+STD_ROM_FN(Dblaxleu)
+
 static struct BurnRomInfo PwheelsjRomDesc[] = {
-	{ "c78-26-2.2",    0x020000, 0x25c8eb2e, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "c78-28-2.4",    0x020000, 0xa9500eb1, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "c78-27-2.3",    0x020000, 0x08d2cffb, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "c78-29-2.5",    0x020000, 0xe1608004, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_26-2.2",    0x020000, 0x25c8eb2e, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_28-2.4",    0x020000, 0xa9500eb1, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_27-2.3",    0x020000, 0x08d2cffb, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "c78_29-2.5",    0x020000, 0xe1608004, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	
 	{ "c78-30-1.35",   0x020000, 0x026aac18, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
 	{ "c78-31-1.36",   0x020000, 0x67ce23e8, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
@@ -2293,10 +2366,45 @@ STD_ROM_PICK(Pwheelsj)
 STD_ROM_FN(Pwheelsj)
 
 static struct BurnRomInfo EnforceRomDesc[] = {
-	{ "b58-27.27",     0x20000, 0xa1aa0191, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "b58-38.27",     0x20000, 0xa1aa0191, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "b58-36.19",     0x20000, 0x40f43da3, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	
+	{ "b58-37.26",     0x20000, 0xe823c85c, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
+	{ "b58-35.18",     0x20000, 0x8b3ceb12, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
+	
+	{ "b58-32.41",     0x10000, 0xf3fd8eca, BRF_ESS | BRF_PRG | TAITO_Z80ROM1 },
+	
+	{ "b58-09.13",     0x80000, 0x9ffd5b31, BRF_GRA | TAITO_CHARS },
+	
+	{ "b58-04.7",      0x80000, 0x9482f08d, BRF_GRA | TAITO_SPRITESA_BYTESWAP32 },
+	{ "b58-03.6",      0x80000, 0x158bc440, BRF_GRA | TAITO_SPRITESA_BYTESWAP32 },
+	{ "b58-02.2",      0x80000, 0x6a6e307c, BRF_GRA | TAITO_SPRITESA_BYTESWAP32 },
+	{ "b58-01.1",      0x80000, 0x01e9f0a8, BRF_GRA | TAITO_SPRITESA_BYTESWAP32 },
+	
+	{ "b58-06.116",    0x80000, 0xb3495d70, BRF_GRA | TAITO_ROAD },
+	
+	{ "b58-05.71",     0x80000, 0xd1f4991b, BRF_GRA | TAITO_SPRITEMAP },
+	
+	{ "b58-07.11",     0x80000, 0xeeb5ba08, BRF_SND | TAITO_YM2610A },
+	{ "b58-08.12",     0x80000, 0x049243cf, BRF_SND | TAITO_YM2610A },
+	
+	{ "b58-10.14",     0x80000, 0xedce0cc1, BRF_SND | TAITO_YM2610B },
+	
+	{ "b58-26.104",    0x10000, 0xdccb0c7f, BRF_OPT },
+	{ "b58-27.56",     0x02000, 0x5c6b013d, BRF_OPT },
+	{ "b58-23.52",     0x00100, 0x7b7d8ff4, BRF_OPT },
+	{ "b58-24.51",     0x00100, 0xfbf81f30, BRF_OPT },
+	{ "b58-25.75",     0x00100, 0xde547342, BRF_OPT },
+};
+
+STD_ROM_PICK(Enforce)
+STD_ROM_FN(Enforce)
+
+static struct BurnRomInfo EnforcejRomDesc[] = {
+	{ "b58-17.27",     0x20000, 0xa1aa0191, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b58-19.19",     0x20000, 0x40f43da3, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	
-	{ "b58-26.26",     0x20000, 0xe823c85c, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
+	{ "b58-16.26",     0x20000, 0xe823c85c, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
 	{ "b58-18.18",     0x20000, 0x65328a3e, BRF_ESS | BRF_PRG | TAITO_68KROM2_BYTESWAP },
 	
 	{ "b58-32.41",     0x10000, 0xf3fd8eca, BRF_ESS | BRF_PRG | TAITO_Z80ROM1 },
@@ -2317,15 +2425,15 @@ static struct BurnRomInfo EnforceRomDesc[] = {
 	
 	{ "b58-10.14",     0x80000, 0xedce0cc1, BRF_SND | TAITO_YM2610B },
 	
-	{ "b58-26a.104",   0x10000, 0xdccb0c7f, BRF_OPT },
+	{ "b58-26.104",    0x10000, 0xdccb0c7f, BRF_OPT },
 	{ "b58-27.56",     0x02000, 0x5c6b013d, BRF_OPT },
 	{ "b58-23.52",     0x00100, 0x7b7d8ff4, BRF_OPT },
 	{ "b58-24.51",     0x00100, 0xfbf81f30, BRF_OPT },
 	{ "b58-25.75",     0x00100, 0xde547342, BRF_OPT },
 };
 
-STD_ROM_PICK(Enforce)
-STD_ROM_FN(Enforce)
+STD_ROM_PICK(Enforcej)
+STD_ROM_FN(Enforcej)
 
 static struct BurnRomInfo NightstrRomDesc[] = {
 	{ "b91-45.bin",    0x20000, 0x7ad63421, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
@@ -6291,6 +6399,16 @@ struct BurnDriver BurnDrvDblaxle = {
 	NULL, 0x1000, 320, 240, 4, 3
 };
 
+struct BurnDriver BurnDrvDblaxleu = {
+	"dblaxleu", "dblaxle", NULL, NULL, "1991",
+	"Double Axle (US earlier)\0", NULL, "Taito America Corporation", "Taito-Z",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0,
+	NULL, DblaxleuRomInfo, DblaxleuRomName, NULL, NULL, DblaxleInputInfo, DblaxleDIPInfo,
+	DblaxleInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan,
+	NULL, 0x1000, 320, 240, 4, 3
+};
+
 struct BurnDriver BurnDrvPwheelsj = {
 	"pwheelsj", "dblaxle", NULL, NULL, "1991",
 	"Power Wheels (Japan)\0", NULL, "Taito Corporation", "Taito-Z",
@@ -6303,7 +6421,7 @@ struct BurnDriver BurnDrvPwheelsj = {
 
 struct BurnDriver BurnDrvEnforce = {
 	"enforce", NULL, NULL, NULL, "1988",
-	"Enforce (Japan)\0", NULL, "Taito Corporation", "Taito-Z",
+	"Enforce (World)\0", NULL, "Taito Corporation Japan", "Taito-Z",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0,
 	NULL, EnforceRomInfo, EnforceRomName, NULL, NULL, EnforceInputInfo, EnforceDIPInfo,
@@ -6311,6 +6429,16 @@ struct BurnDriver BurnDrvEnforce = {
 	NULL, 0x1000, 320, 224, 4, 3
 };
 
+struct BurnDriver BurnDrvEnforcej = {
+	"enforcej", "enforce", NULL, NULL, "1988",
+	"Enforce (Japan)\0", NULL, "Taito Corporation", "Taito-Z",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0,
+	NULL, EnforcejRomInfo, EnforcejRomName, NULL, NULL, EnforceInputInfo, EnforcejDIPInfo,
+	EnforceInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan,
+	NULL, 0x1000, 320, 224, 4, 3
+};
+
 struct BurnDriver BurnDrvNightstr = {
 	"nightstr", NULL, NULL, NULL, "1989",
 	"Night Striker (World)\0", NULL, "Taito Corporation Japan", "Taito-Z",