diff --git a/src/burn/drv/galaxian/d_galaxian.cpp b/src/burn/drv/galaxian/d_galaxian.cpp
index 523f68b9f4..9370570677 100644
--- a/src/burn/drv/galaxian/d_galaxian.cpp
+++ b/src/burn/drv/galaxian/d_galaxian.cpp
@@ -6872,7 +6872,7 @@ static struct BurnRomInfo ZerotimemcRomDesc[] = {
 STD_ROM_PICK(Zerotimemc)
 STD_ROM_FN(Zerotimemc)
 
-static struct BurnRomInfo ZerotimeuRomDesc[] = {
+static struct BurnRomInfo ZerotimeaRomDesc[] = {
 	// Unknown manufacturer / bootleger
 	{ "1.bin",         0x00800, 0xac64aabe, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
 	{ "2.bin",         0x00800, 0xa433067e, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
@@ -6886,8 +6886,25 @@ static struct BurnRomInfo ZerotimeuRomDesc[] = {
 	{ "82s123.bin",    0x00020, 0xc3ac9467, BRF_GRA | GAL_ROM_PROM },
 };
 
-STD_ROM_PICK(Zerotimeu)
-STD_ROM_FN(Zerotimeu)
+STD_ROM_PICK(Zerotimea)
+STD_ROM_FN(Zerotimea)
+
+static struct BurnRomInfo ZerotimebRomDesc[] = {
+	// Unknown manufacturer / bootleger
+	{ "p01-6b52-2716.bin",  0x00800, 0x90a2bc61, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
+	{ "p02-f499-2716.bin",  0x00800, 0xa433067e, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
+	{ "p03a-eh61-2716.bin", 0x00800, 0xaaf038d4, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
+	{ "p04-17c7-2716.bin",  0x00800, 0x786d690a, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
+	{ "p05-07fe-2716.bin",  0x00800, 0xaf9260d7, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
+	
+	{ "7-2716.bin",         0x00800, 0x39546539, BRF_GRA | GAL_ROM_TILES_SHARED },
+	{ "6-2716.bin",         0x00800, 0xd10337c3, BRF_GRA | GAL_ROM_TILES_SHARED },
+	
+	{ "mb7051.6l",          0x00020, 0xc3ac9467, BRF_GRA | GAL_ROM_PROM },
+};
+
+STD_ROM_PICK(Zerotimeb)
+STD_ROM_FN(Zerotimeb)
 
 static struct BurnRomInfo GalaxcirsaRomDesc[] = {
 	{ "cirsagal.1",    0x00800, 0xac64aabe, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
@@ -7346,12 +7363,22 @@ struct BurnDriver BurnDrvZerotimemc = {
 	NULL, 392, 224, 256, 3, 4
 };
 
-struct BurnDriver BurnDrvZerotimeu = {
-	"zerotimeu", "galaxian", NULL, NULL, "1979",
-	"Zero Time (Spanish bootleg)\0", NULL, "bootleg", "Galaxian",
+struct BurnDriver BurnDrvZerotimea = {
+	"zerotimea", "galaxian", NULL, NULL, "1979",
+	"Zero Time (Spanish bootleg, set 1)\0", NULL, "bootleg", "Galaxian",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_GALAXIAN, GBF_VERSHOOT, 0,
+	NULL, ZerotimeaRomInfo, ZerotimeaRomName, NULL, NULL, NULL, NULL, GalaxianInputInfo, ZerotimeDIPInfo,
+	GalInit, GalExit, GalFrame, GalDraw, GalScan,
+	NULL, 392, 224, 256, 3, 4
+};
+
+struct BurnDriver BurnDrvZerotimeb = {
+	"zerotimeb", "galaxian", NULL, NULL, "1979",
+	"Zero Time (Spanish bootleg, set 2)\0", NULL, "bootleg", "Galaxian",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_GALAXIAN, GBF_VERSHOOT, 0,
-	NULL, ZerotimeuRomInfo, ZerotimeuRomName, NULL, NULL, NULL, NULL, GalaxianInputInfo, ZerotimeDIPInfo,
+	NULL, ZerotimebRomInfo, ZerotimebRomName, NULL, NULL, NULL, NULL, GalaxianInputInfo, ZerotimeDIPInfo,
 	GalInit, GalExit, GalFrame, GalDraw, GalScan,
 	NULL, 392, 224, 256, 3, 4
 };
@@ -10088,7 +10115,7 @@ struct BurnDriver BurnDrvPacmanblc = {
 
 struct BurnDriver BurnDrvPacmanblv = {
 	"pacmanblv", "puckman", NULL, NULL, "1981",
-	"Pac-Man (Video Dens, Spanish bootleg on Galaxian hardware)\0", NULL, "bootleg (Video Dens)", "Galaxian",
+	"Pac-Man (Video Dens, Spanish bootleg on Galaxian hardware, set 1)\0", NULL, "bootleg (Video Dens)", "Galaxian",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED  | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_GALAXIAN, GBF_MAZE, 0,
 	NULL, PacmanblvRomInfo, PacmanblvRomName, NULL, NULL, NULL, NULL, PacmanblInputInfo, PacmanblDIPInfo,
@@ -14320,7 +14347,7 @@ struct BurnDriver BurnDrvJumpbug = {
 
 struct BurnDriver BurnDrvJumpbugb = {
 	"jumpbugb", "jumpbug", NULL, NULL, "1981",
-	"Jump Bug (bootleg)\0", NULL, "bootleg", "Galaxian",
+	"Jump Bug (bootleg, set 1)\0", NULL, "bootleg", "Galaxian",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_GALAXIAN, GBF_HORSHOOT, 0,
 	NULL, JumpbugbRomInfo, JumpbugbRomName, NULL, NULL, NULL, NULL, JumpbugInputInfo, JumpbugDIPInfo,
diff --git a/src/burn/drv/pre90s/d_pitnrun.cpp b/src/burn/drv/pre90s/d_pitnrun.cpp
index 0f75855ea8..53e3122390 100644
--- a/src/burn/drv/pre90s/d_pitnrun.cpp
+++ b/src/burn/drv/pre90s/d_pitnrun.cpp
@@ -906,7 +906,7 @@ struct BurnDriver BurnDrvPitnrunb = {
 	"pitnrunb", "pitnrun", NULL, NULL, "1984",
 	"Pit & Run - F-1 Race (location test?)\0", "Missing analog sounds and some gfx effects", "Taito Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_PREFIX_TAITO, GBF_RACING, 0,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_PROTOTYPE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_PREFIX_TAITO, GBF_RACING, 0,
 	NULL, pitnrunbRomInfo, pitnrunbRomName, NULL, NULL, NULL, NULL, PitnrunInputInfo, PitnrunDIPInfo,
 	PitnrunInit, DrvExit, DrvFrame, DrvDraw, NULL, &DrvRecalc, 0,
 	224, 256, 3, 4
diff --git a/src/burn/drv/pre90s/d_tsamurai.cpp b/src/burn/drv/pre90s/d_tsamurai.cpp
index ef0f08ede8..7dc51c1467 100644
--- a/src/burn/drv/pre90s/d_tsamurai.cpp
+++ b/src/burn/drv/pre90s/d_tsamurai.cpp
@@ -1389,7 +1389,7 @@ static INT32 DrvScan(INT32 nAction,INT32 *pnMin)
 }
 
 
-// Samurai Nihon-Ichi (set 1)
+// Samurai Nihon-Ichi (rev 1)
 // there's a protection device labeled B5 at location l3 on the main board
 
 static struct BurnRomInfo tsamuraiRomDesc[] = {
@@ -1429,7 +1429,7 @@ static INT32 tsamuraiInit()
 
 struct BurnDriver BurnDrvTsamurai = {
 	"tsamurai", NULL, NULL, NULL, "1985",
-	"Samurai Nihon-Ichi (set 1)\0", NULL, "Kaneko / Taito", "Miscellaneous",
+	"Samurai Nihon-Ichi (rev 1)\0", NULL, "Kaneko / Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_SCRFIGHT, 0,
 	NULL, tsamuraiRomInfo, tsamuraiRomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, TsamuraiDIPInfo,
@@ -1438,9 +1438,9 @@ struct BurnDriver BurnDrvTsamurai = {
 };
 
 
-// Samurai Nihon-Ichi (set 2)
+// Samurai Nihon-Ichi
 
-static struct BurnRomInfo tsamurai2RomDesc[] = {
+static struct BurnRomInfo tsamuraiaRomDesc[] = {
 	{ "a35-01.3r",		0x4000, 0x282d96ad, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "a35-02.3t",		0x4000, 0xe3fa0cfa, 1 | BRF_PRG | BRF_ESS }, //  1
 	{ "a35-03.3v",		0x4000, 0x2fff1e0a, 1 | BRF_PRG | BRF_ESS }, //  2
@@ -1467,15 +1467,15 @@ static struct BurnRomInfo tsamurai2RomDesc[] = {
 	{ "a35-18.2m",		0x0100, 0x918e4732, 7 | BRF_GRA },           // 17
 };
 
-STD_ROM_PICK(tsamurai2)
-STD_ROM_FN(tsamurai2)
+STD_ROM_PICK(tsamuraia)
+STD_ROM_FN(tsamuraia)
 
-struct BurnDriver BurnDrvTsamurai2 = {
-	"tsamurai2", "tsamurai", NULL, NULL, "1985",
-	"Samurai Nihon-Ichi (set 2)\0", NULL, "Kaneko / Taito", "Miscellaneous",
+struct BurnDriver BurnDrvTsamuraia = {
+	"tsamuraia", "tsamurai", NULL, NULL, "1985",
+	"Samurai Nihon-Ichi\0", NULL, "Kaneko / Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_SCRFIGHT, 0,
-	NULL, tsamurai2RomInfo, tsamurai2RomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, TsamuraiDIPInfo,
+	NULL, tsamuraiaRomInfo, tsamuraiaRomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, TsamuraiDIPInfo,
 	tsamuraiInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x100,
 	224, 256, 3, 4
 };
@@ -1524,7 +1524,7 @@ struct BurnDriver BurnDrvTsamuraih = {
 };
 
 
-// Lady Master of Kung Fu (set 1, newer)
+// Lady Master of Kung Fu (rev 1)
 // there's a protection device labeled 6 at location l3 on the main board
 
 static struct BurnRomInfo ladymstrRomDesc[] = {
@@ -1559,7 +1559,7 @@ STD_ROM_FN(ladymstr)
 
 struct BurnDriver BurnDrvLadymstr = {
 	"ladymstr", NULL, NULL, NULL, "1985",
-	"Lady Master of Kung Fu (set 1, newer)\0", NULL, "Kaneko / Taito", "Miscellaneous",
+	"Lady Master of Kung Fu (rev 1)\0", NULL, "Kaneko / Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_SCRFIGHT, 0,
 	NULL, ladymstrRomInfo, ladymstrRomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, LadymstrDIPInfo,
@@ -1568,10 +1568,10 @@ struct BurnDriver BurnDrvLadymstr = {
 };
 
 
-// Lady Master of Kung Fu (set 2, older)
+// Lady Master of Kung Fu
 // there's a protection device labeled 6 at location l3 on the main board
 
-static struct BurnRomInfo ladymstr2RomDesc[] = {
+static struct BurnRomInfo ladymstraRomDesc[] = {
 	{ "a49-01.3r",		0x4000, 0x8729e50e, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code // believed to be newer because of the -01 suffix
 	{ "a49-02.3t",		0x4000, 0xb0a9020b, 1 | BRF_PRG | BRF_ESS }, //  1
 	{ "a49-03.3v",		0x4000, 0x641c94ed, 1 | BRF_PRG | BRF_ESS }, //  2
@@ -1598,15 +1598,15 @@ static struct BurnRomInfo ladymstr2RomDesc[] = {
 	{ "a49-18.2m",		0x0100, 0xf5ce3c45, 7 | BRF_GRA },           // 17
 };
 
-STD_ROM_PICK(ladymstr2)
-STD_ROM_FN(ladymstr2)
+STD_ROM_PICK(ladymstra)
+STD_ROM_FN(ladymstra)
 
-struct BurnDriver BurnDrvLadymstr2 = {
-	"ladymstr2", "ladymstr", NULL, NULL, "1985",
-	"Lady Master of Kung Fu (set 2, older)\0", NULL, "Kaneko / Taito", "Miscellaneous",
+struct BurnDriver BurnDrvLadymstra = {
+	"ladymstra", "ladymstr", NULL, NULL, "1985",
+	"Lady Master of Kung Fu\0", NULL, "Kaneko / Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_SCRFIGHT, 0,
-	NULL, ladymstr2RomInfo, ladymstr2RomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, LadymstrDIPInfo,
+	NULL, ladymstraRomInfo, ladymstraRomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, LadymstrDIPInfo,
 	tsamuraiInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x100,
 	224, 256, 3, 4
 };
diff --git a/src/burn/drv/taito/d_taitof2.cpp b/src/burn/drv/taito/d_taitof2.cpp
index bf0d4206bb..7e4fe7d8b4 100644
--- a/src/burn/drv/taito/d_taitof2.cpp
+++ b/src/burn/drv/taito/d_taitof2.cpp
@@ -11554,7 +11554,7 @@ struct BurnDriver BurnDrvNinjaku = {
 
 struct BurnDriver BurnDrvPulirula = {
 	"pulirula", NULL, NULL, NULL, "1991",
-	"PuLiRuLa (World)\0", NULL, "Taito Corporation Japan", "Taito F2",
+	"PuLiRuLa (World, dual PCB)\0", NULL, "Taito Corporation Japan", "Taito F2",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOF2, GBF_SCRFIGHT, 0,
 	NULL, PulirulaRomInfo, PulirulaRomName, NULL, NULL, NULL, NULL, PulirulaInputInfo, PulirulaDIPInfo,
@@ -11564,7 +11564,7 @@ struct BurnDriver BurnDrvPulirula = {
 
 struct BurnDriver BurnDrvPulirulaa = {
 	"pulirulaa", "pulirula", NULL, NULL, "1991",
-	"PuLiRuLa (World, earlier?)\0", NULL, "Taito Corporation", "Taito F2",
+	"PuLiRuLa (World, single PCB)\0", NULL, "Taito Corporation", "Taito F2",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOF2, GBF_SCRFIGHT, 0,
 	NULL, PulirulaaRomInfo, PulirulaaRomName, NULL, NULL, NULL, NULL, PulirulaInputInfo, PulirulaDIPInfo,