diff --git a/src/burn/drv/pre90s/d_pitnrun.cpp b/src/burn/drv/pre90s/d_pitnrun.cpp
index 4ec3bf051..35a58a12f 100644
--- a/src/burn/drv/pre90s/d_pitnrun.cpp
+++ b/src/burn/drv/pre90s/d_pitnrun.cpp
@@ -1,4 +1,4 @@
-// FBAlpha Pit 'n Run driver, based on MAME driver by Tomasz Slanina, Pierpaolo Prazzoli
+// FB Neo Pit 'n Run driver, based on MAME driver by Tomasz Slanina, Pierpaolo Prazzoli
 
 // Jump Kun fully working.
 //
@@ -462,12 +462,7 @@ static void DrvGfxDecode()
 
 static INT32 DrvInit(INT32 game)
 {
-	AllMem = NULL;
-	MemIndex();
-	INT32 nLen = MemEnd - (UINT8 *)0;
-	if ((AllMem = (UINT8 *)BurnMalloc(nLen)) == NULL) return 1;
-	memset(AllMem, 0, nLen);
-	MemIndex();
+	BurnAllocMemIndex();
 
 	game_select = game;
 
@@ -577,7 +572,7 @@ static INT32 DrvExit()
 	AY8910Exit(0);
 	AY8910Exit(1);
 
-	BurnFree (AllMem);
+	BurnFreeMemIndex();
 
 	return 0;
 }
@@ -784,57 +779,9 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin)
 }
 
 
-// Pit & Run - F-1 Race (set 1)
+// Pit & Run - F-1 Race (rev 1)
 
 static struct BurnRomInfo pitnrunRomDesc[] = {
-	{ "pr12",		0x2000, 0x587a7b85, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
-	{ "pr11",		0x2000, 0x270cd6dd, 1 | BRF_PRG | BRF_ESS }, //  1
-	{ "pr10",		0x2000, 0x65d92d89, 1 | BRF_PRG | BRF_ESS }, //  2
-	{ "pr9",		0x2000, 0x3155286d, 1 | BRF_PRG | BRF_ESS }, //  3
-
-	{ "pr13",		0x1000, 0xfc8fd05c, 2 | BRF_PRG | BRF_ESS }, //  4 Z80 #1 Code
-
-	{ "a11_17.3a",		0x0800, 0xe7d5d6e1, 3 | BRF_PRG | BRF_ESS }, //  5 M68705 Code
-
-	{ "pr1",		0x2000, 0xc3b3131e, 4 | BRF_GRA },           //  6 Sprites
-	{ "pr2",		0x2000, 0x2fa1682a, 4 | BRF_GRA },           //  7
-	{ "pr3",		0x2000, 0xe678fe39, 4 | BRF_GRA },           //  8
-
-	{ "pr4",		0x2000, 0xfbae3504, 5 | BRF_GRA },           //  9 Background Tiles
-	{ "pr5",		0x2000, 0xc9177180, 5 | BRF_GRA },           // 10
-
-	{ "pr6",		0x1000, 0xc53cb897, 6 | BRF_GRA },           // 11 Foreground Tiles
-	{ "pr7",		0x1000, 0x7cdf9a55, 6 | BRF_GRA },           // 12
-
-	{ "pr8",		0x2000, 0x8e346d10, 7 | BRF_GRA },           // 13 Spot graphics
-
-	{ "clr.1",		0x0020, 0x643012f4, 8 | BRF_GRA },           // 14 Color data
-	{ "clr.2",		0x0020, 0x50705f02, 8 | BRF_GRA },           // 15
-	{ "clr.3",		0x0020, 0x25e70e5e, 8 | BRF_GRA },           // 16
-};
-
-STD_ROM_PICK(pitnrun)
-STD_ROM_FN(pitnrun)
-
-static INT32 PitnrunInit()
-{
-	return DrvInit(0);
-}
-
-struct BurnDriver BurnDrvPitnrun = {
-	"pitnrun", NULL, NULL, NULL, "1984",
-	"Pit & Run - F-1 Race (set 1)\0", "Missing analog sounds and some gfx effects", "Taito Corporation", "Miscellaneous",
-	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_PREFIX_TAITO, GBF_RACING, 0,
-	NULL, pitnrunRomInfo, pitnrunRomName, NULL, NULL, NULL, NULL, PitnrunInputInfo, PitnrunDIPInfo,
-	PitnrunInit, DrvExit, DrvFrame, DrvDraw, NULL, &DrvRecalc, 0,
-	224, 256, 3, 4
-};
-
-
-// Pit & Run - F-1 Race (set 2)
-
-static struct BurnRomInfo pitnrunaRomDesc[] = {
 	{ "pr_12-1.5d",		0x2000, 0x2539aec3, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "pr_11-1.5c",		0x2000, 0x818a49f8, 1 | BRF_PRG | BRF_ESS }, //  1
 	{ "pr_10-1.5b",		0x2000, 0x69b3a864, 1 | BRF_PRG | BRF_ESS }, //  2
@@ -861,12 +808,60 @@ static struct BurnRomInfo pitnrunaRomDesc[] = {
 	{ "clr.3",		0x0020, 0x25e70e5e, 8 | BRF_GRA },           // 16
 };
 
+STD_ROM_PICK(pitnrun)
+STD_ROM_FN(pitnrun)
+
+static INT32 PitnrunInit()
+{
+	return DrvInit(0);
+}
+
+struct BurnDriver BurnDrvPitnrun = {
+	"pitnrun", NULL, NULL, NULL, "1984",
+	"Pit & Run - F-1 Race (rev 1)\0", "Missing analog sounds and some gfx effects", "Taito Corporation", "Miscellaneous",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_PREFIX_TAITO, GBF_RACING, 0,
+	NULL, pitnrunRomInfo, pitnrunRomName, NULL, NULL, NULL, NULL, PitnrunInputInfo, PitnrunDIPInfo,
+	PitnrunInit, DrvExit, DrvFrame, DrvDraw, NULL, &DrvRecalc, 0,
+	224, 256, 3, 4
+};
+
+
+// Pit & Run - F-1 Race
+
+static struct BurnRomInfo pitnrunaRomDesc[] = {
+	{ "pr_12.5d",	0x2000, 0x587a7b85, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
+	{ "pr_11.5c",	0x2000, 0x270cd6dd, 1 | BRF_PRG | BRF_ESS }, //  1
+	{ "pr_10.5b",	0x2000, 0x65d92d89, 1 | BRF_PRG | BRF_ESS }, //  2
+	{ "pr_9.5a",	0x2000, 0x3155286d, 1 | BRF_PRG | BRF_ESS }, //  3
+
+	{ "pr13",		0x1000, 0xfc8fd05c, 2 | BRF_PRG | BRF_ESS }, //  4 Z80 #1 Code
+
+	{ "a11_17.3a",	0x0800, 0xe7d5d6e1, 3 | BRF_PRG | BRF_ESS }, //  5 M68705 Code
+
+	{ "pr1",		0x2000, 0xc3b3131e, 4 | BRF_GRA },           //  6 Sprites
+	{ "pr2",		0x2000, 0x2fa1682a, 4 | BRF_GRA },           //  7
+	{ "pr3",		0x2000, 0xe678fe39, 4 | BRF_GRA },           //  8
+
+	{ "pr4",		0x2000, 0xfbae3504, 5 | BRF_GRA },           //  9 Background Tiles
+	{ "pr5",		0x2000, 0xc9177180, 5 | BRF_GRA },           // 10
+
+	{ "pr6",		0x1000, 0xc53cb897, 6 | BRF_GRA },           // 11 Foreground Tiles
+	{ "pr7",		0x1000, 0x7cdf9a55, 6 | BRF_GRA },           // 12
+
+	{ "pr8",		0x2000, 0x8e346d10, 7 | BRF_GRA },           // 13 Spot graphics
+
+	{ "clr.1",		0x0020, 0x643012f4, 8 | BRF_GRA },           // 14 Color data
+	{ "clr.2",		0x0020, 0x50705f02, 8 | BRF_GRA },           // 15
+	{ "clr.3",		0x0020, 0x25e70e5e, 8 | BRF_GRA },           // 16
+};
+
 STD_ROM_PICK(pitnruna)
 STD_ROM_FN(pitnruna)
 
 struct BurnDriver BurnDrvPitnruna = {
 	"pitnruna", "pitnrun", NULL, NULL, "1984",
-	"Pit & Run - F-1 Race (set 2)\0", "Missing analog sounds and some gfx effects", "Taito Corporation", "Miscellaneous",
+	"Pit & Run - F-1 Race\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,
 	NULL, pitnrunaRomInfo, pitnrunaRomName, NULL, NULL, NULL, NULL, PitnrunInputInfo, PitnrunDIPInfo,
@@ -875,29 +870,29 @@ struct BurnDriver BurnDrvPitnruna = {
 };
 
 
-// Pit & Run - F-1 Race (set 3)
+// Pit & Run - F-1 Race (location test?)
 
 static struct BurnRomInfo pitnrunbRomDesc[] = {
-	{ "test.a1",		0x2000, 0x395b5514, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
-	{ "test.a2",		0x2000, 0x09ffb063, 1 | BRF_PRG | BRF_ESS }, //  1
-	{ "test.a3",		0x2000, 0x4f96e346, 1 | BRF_PRG | BRF_ESS }, //  2
-	{ "test.a4",		0x2000, 0x3d04ef80, 1 | BRF_PRG | BRF_ESS }, //  3
+	{ "test.a1",	0x2000, 0x395b5514, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
+	{ "test.a2",	0x2000, 0x09ffb063, 1 | BRF_PRG | BRF_ESS }, //  1
+	{ "test.a3",	0x2000, 0x4f96e346, 1 | BRF_PRG | BRF_ESS }, //  2
+	{ "test.a4",	0x2000, 0x3d04ef80, 1 | BRF_PRG | BRF_ESS }, //  3
 
 	{ "sound",		0x1000, 0xfbd63042, 2 | BRF_PRG | BRF_ESS }, //  4 Z80 #1 Code
 
-	{ "a11_17.3a",		0x0800, 0xe7d5d6e1, 3 | BRF_PRG | BRF_ESS }, //  5 M68705 Code
+	{ "a11_17.3a",	0x0800, 0xe7d5d6e1, 3 | BRF_PRG | BRF_ESS }, //  5 M68705 Code
 
-	{ "obj3",			0x2000, 0xc3b3131e, 4 | BRF_GRA },           //  6 Sprites
-	{ "obj2",			0x2000, 0x2fa1682a, 4 | BRF_GRA },           //  7
-	{ "obj1",			0x2000, 0xe678fe39, 4 | BRF_GRA },           //  8
+	{ "obj3",		0x2000, 0xc3b3131e, 4 | BRF_GRA },           //  6 Sprites
+	{ "obj2",		0x2000, 0x2fa1682a, 4 | BRF_GRA },           //  7
+	{ "obj1",		0x2000, 0xe678fe39, 4 | BRF_GRA },           //  8
 
-	{ "chr1",			0x2000, 0xfbae3504, 5 | BRF_GRA },           //  9 Background Tiles
-	{ "chr2",			0x2000, 0xc9177180, 5 | BRF_GRA },           // 10
+	{ "chr1",		0x2000, 0xfbae3504, 5 | BRF_GRA },           //  9 Background Tiles
+	{ "chr2",		0x2000, 0xc9177180, 5 | BRF_GRA },           // 10
 
-	{ "bsc1",			0x1000, 0xc53cb897, 6 | BRF_GRA },           // 11 Foreground Tiles
-	{ "bsc2",			0x1000, 0x7cdf9a55, 6 | BRF_GRA },           // 12
+	{ "bsc1",		0x1000, 0xc53cb897, 6 | BRF_GRA },           // 11 Foreground Tiles
+	{ "bsc2",		0x1000, 0x7cdf9a55, 6 | BRF_GRA },           // 12
 
-	{ "lightdata",		0x2000, 0x8e346d10, 7 | BRF_GRA },           // 13 Spot graphics
+	{ "lightdata",	0x2000, 0x8e346d10, 7 | BRF_GRA },           // 13 Spot graphics
 
 	{ "bp1",		0x0020, 0x643012f4, 8 | BRF_GRA },           // 14 Color data
 	{ "bp2",		0x0020, 0x50705f02, 8 | BRF_GRA },           // 15
@@ -909,7 +904,7 @@ STD_ROM_FN(pitnrunb)
 
 struct BurnDriver BurnDrvPitnrunb = {
 	"pitnrunb", "pitnrun", NULL, NULL, "1984",
-	"Pit & Run - F-1 Race (set 3)\0", "Missing analog sounds and some gfx effects", "Taito Corporation", "Miscellaneous",
+	"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,
 	NULL, pitnrunbRomInfo, pitnrunbRomName, NULL, NULL, NULL, NULL, PitnrunInputInfo, PitnrunDIPInfo,
diff --git a/src/burn/drv/pre90s/d_tsamurai.cpp b/src/burn/drv/pre90s/d_tsamurai.cpp
index ea63003a4..86a1a5661 100644
--- a/src/burn/drv/pre90s/d_tsamurai.cpp
+++ b/src/burn/drv/pre90s/d_tsamurai.cpp
@@ -1067,12 +1067,7 @@ static INT32 VsgongfCommonInit(INT32 game)
 {
 	game_select = 3;
 
-	AllMem = NULL;
-	MemIndex();
-	INT32 nLen = MemEnd - (UINT8 *)0;
-	if ((AllMem = (UINT8 *)BurnMalloc(nLen)) == NULL) return 1;
-	memset(AllMem, 0, nLen);
-	MemIndex();
+	BurnAllocMemIndex();
 
 	{
 		if (game == 0)
@@ -1996,7 +1991,7 @@ struct BurnDriver BurnDrvVsgongf = {
 };
 
 
-// Ring Fighter (set 1)
+// Ring Fighter (rev 1)
 
 static struct BurnRomInfo ringfgtRomDesc[] = {
 	{ "rft_04-1.5a",	0x2000, 0x11030866, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
@@ -2030,7 +2025,7 @@ static INT32 RingfgtInit()
 
 struct BurnDriver BurnDrvRingfgt = {
 	"ringfgt", "vsgongf", NULL, NULL, "1984",
-	"Ring Fighter (set 1)\0", NULL, "Kaneko (Taito license)", "Miscellaneous",
+	"Ring Fighter (rev 1)\0", NULL, "Kaneko (Taito license)", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_SPORTSMISC, 0,
 	NULL, ringfgtRomInfo, ringfgtRomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, VsgongfDIPInfo,
@@ -2039,9 +2034,9 @@ struct BurnDriver BurnDrvRingfgt = {
 };
 
 
-// Ring Fighter (set 2)
+// Ring Fighter
 
-static struct BurnRomInfo ringfgt2RomDesc[] = {
+static struct BurnRomInfo ringfgtaRomDesc[] = {
 	{ "rft_04.5a",		0x2000, 0x6b9b3f3d, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "rft_03.5c",		0x2000, 0x1821974b, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -2061,22 +2056,22 @@ static struct BurnRomInfo ringfgt2RomDesc[] = {
 	{ "rft-13.6p",		0x0100, 0x0e4fd17a, 5 | BRF_GRA },           // 12
 };
 
-STD_ROM_PICK(ringfgt2)
-STD_ROM_FN(ringfgt2)
+STD_ROM_PICK(ringfgta)
+STD_ROM_FN(ringfgta)
 
-static INT32 Ringfgt2Init()
+static INT32 RingfgtaInit()
 {
 	vsgongf_protval = 0x6ac0;
 
 	return VsgongfCommonInit(1);
 }
 
-struct BurnDriver BurnDrvRingfgt2 = {
-	"ringfgt2", "vsgongf", NULL, NULL, "1984",
-	"Ring Fighter (set 2)\0", NULL, "Kaneko (Taito license)", "Miscellaneous",
+struct BurnDriver BurnDrvRingfgta = {
+	"ringfgta", "vsgongf", NULL, NULL, "1984",
+	"Ring Fighter\0", NULL, "Kaneko (Taito license)", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_SPORTSMISC, 0,
-	NULL, ringfgt2RomInfo, ringfgt2RomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, VsgongfDIPInfo,
-	Ringfgt2Init, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x100,
+	NULL, ringfgtaRomInfo, ringfgtaRomName, NULL, NULL, NULL, NULL, TsamuraiInputInfo, VsgongfDIPInfo,
+	RingfgtaInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x100,
 	224, 256, 3, 4
 };
diff --git a/src/burn/drv/taito/d_asuka.cpp b/src/burn/drv/taito/d_asuka.cpp
index 32d542da3..42154a09f 100644
--- a/src/burn/drv/taito/d_asuka.cpp
+++ b/src/burn/drv/taito/d_asuka.cpp
@@ -1659,7 +1659,7 @@ struct BurnDriver BurnDrvCadash = {
 };
 
 
-// Cadash (Japan, version 2)
+// Cadash (Japan, rev 2)
 
 static struct BurnRomInfo cadashjRomDesc[] = {
 	{ "c21_04-2.ic11",			0x20000, 0x7a9c1828, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -1686,7 +1686,7 @@ STD_ROM_FN(cadashj)
 
 struct BurnDriver BurnDrvCadashj = {
 	"cadashj", "cadash", NULL, NULL, "1989",
-	"Cadash (Japan, version 2)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Cadash (Japan, rev 2)\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, cadashjRomInfo, cadashjRomName, NULL, NULL, NULL, NULL, CadashInputInfo, CadashjDIPInfo,
@@ -1695,7 +1695,7 @@ struct BurnDriver BurnDrvCadashj = {
 };
 
 
-// Cadash (Japan, version 1)
+// Cadash (Japan, rev 1)
 
 static struct BurnRomInfo cadashj1RomDesc[] = {
 	{ "c21_04-1.ic11",			0x20000, 0xcc22ebe5, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -1722,7 +1722,7 @@ STD_ROM_FN(cadashj1)
 
 struct BurnDriver BurnDrvCadashj1 = {
 	"cadashj1", "cadash", NULL, NULL, "1989",
-	"Cadash (Japan, version 1)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Cadash (Japan, rev 1)\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, cadashj1RomInfo, cadashj1RomName, NULL, NULL, NULL, NULL, CadashInputInfo, CadashjDIPInfo,
@@ -1731,7 +1731,7 @@ struct BurnDriver BurnDrvCadashj1 = {
 };
 
 
-// Cadash (Japan, oldest version)
+// Cadash (Japan)
 
 static struct BurnRomInfo cadashjoRomDesc[] = {
 	{ "c21_04.ic11",			0x20000, 0xbe7d3f12, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -1758,7 +1758,7 @@ STD_ROM_FN(cadashjo)
 
 struct BurnDriver BurnDrvCadashjo = {
 	"cadashjo", "cadash", NULL, NULL, "1989",
-	"Cadash (Japan, oldest version)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Cadash (Japan)\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, cadashjoRomInfo, cadashjoRomName, NULL, NULL, NULL, NULL, CadashInputInfo, CadashjDIPInfo,
@@ -1767,7 +1767,7 @@ struct BurnDriver BurnDrvCadashjo = {
 };
 
 
-// Cadash (US, version 2)
+// Cadash (US, rev 2)
 
 static struct BurnRomInfo cadashuRomDesc[] = {
 	{ "c21_14-2.ic11",			0x20000, 0xf823d418, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -1794,7 +1794,7 @@ STD_ROM_FN(cadashu)
 
 struct BurnDriver BurnDrvCadashu = {
 	"cadashu", "cadash", NULL, NULL, "1989",
-	"Cadash (US, version 2)\0", NULL, "Taito America Corporation", "Taito Misc",
+	"Cadash (US, rev 2)\0", NULL, "Taito America Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, cadashuRomInfo, cadashuRomName, NULL, NULL, NULL, NULL, CadashInputInfo, CadashuDIPInfo,
@@ -1803,7 +1803,7 @@ struct BurnDriver BurnDrvCadashu = {
 };
 
 
-// Cadash (US, version 1?)
+// Cadash (US, rev 1?)
 
 static struct BurnRomInfo cadashu1RomDesc[] = {
 	{ "c21_14-x.ic11",			0x20000, 0x64f22e5e, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -1830,7 +1830,7 @@ STD_ROM_FN(cadashu1)
 
 struct BurnDriver BurnDrvCadashu1 = {
 	"cadashu1", "cadash", NULL, NULL, "1989",
-	"Cadash (US, version 1?)\0", NULL, "Taito America Corporation", "Taito Misc",
+	"Cadash (US, rev 1?)\0", NULL, "Taito America Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, cadashu1RomInfo, cadashu1RomName, NULL, NULL, NULL, NULL, CadashInputInfo, CadashuDIPInfo,
@@ -1911,7 +1911,7 @@ struct BurnDriver BurnDrvCadashf = {
 };
 
 
-// Cadash (Germany, version 1)
+// Cadash (Germany, rev 1)
 
 static struct BurnRomInfo cadashgRomDesc[] = {
 	{ "c21_23-1.ic11",			0x20000, 0x30ddbabe, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -1938,7 +1938,7 @@ STD_ROM_FN(cadashg)
 
 struct BurnDriver BurnDrvCadashg = {
 	"cadashg", "cadash", NULL, NULL, "1989",
-	"Cadash (Germany, version 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
+	"Cadash (Germany, rev 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, cadashgRomInfo, cadashgRomName, NULL, NULL, NULL, NULL, CadashInputInfo, CadashDIPInfo,
@@ -2019,7 +2019,7 @@ struct BurnDriver BurnDrvCadashp = {
 };
 
 
-// Cadash (Spain, version 1)
+// Cadash (Spain, rev 1)
 // no labels on the program ROMs
 
 static struct BurnRomInfo cadashsRomDesc[] = {
@@ -2047,7 +2047,7 @@ STD_ROM_FN(cadashs)
 
 struct BurnDriver BurnDrvCadashs = {
 	"cadashs", "cadash", NULL, NULL, "1989",
-	"Cadash (Spain, version 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
+	"Cadash (Spain, rev 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, cadashsRomInfo, cadashsRomName, NULL, NULL, NULL, NULL, CadashInputInfo, CadashDIPInfo,
@@ -2171,7 +2171,7 @@ struct BurnDriver BurnDrvAsuka = {
 };
 
 
-// Asuka & Asuka (Japan, version 1)
+// Asuka & Asuka (Japan, rev 1)
 
 static struct BurnRomInfo asukajRomDesc[] = {
 	{ "b68-09-1.ic23",		0x20000, 0xd61be555, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -2197,7 +2197,7 @@ STD_ROM_FN(asukaj)
 
 struct BurnDriver BurnDrvAsukaj = {
 	"asukaj", "asuka", NULL, NULL, "1988",
-	"Asuka & Asuka (Japan, version 1)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Asuka & Asuka (Japan, rev 1)\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_VERSHOOT, 0,
 	NULL, asukajRomInfo, asukajRomName, NULL, NULL, NULL, NULL, AsukaInputInfo, AsukaDIPInfo,
@@ -2470,7 +2470,7 @@ struct BurnDriver BurnDrvEarthjkrp = {
 };
 
 
-// Bonze Adventure (World, newer)
+// Bonze Adventure (World, rev 1)
 
 static struct BurnRomInfo bonzeadvRomDesc[] = {
 	{ "b41-09-1.17",		0x10000, 0xaf821fbc, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -2506,7 +2506,7 @@ static INT32 BonzeInit()
 
 struct BurnDriver BurnDrvBonzeadv = {
 	"bonzeadv", NULL, "cchip", NULL, "1988",
-	"Bonze Adventure (World, newer)\0", NULL, "Taito Corporation Japan", "Taito Misc",
+	"Bonze Adventure (World, rev 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_RUNGUN, 0,
 	NULL, bonzeadvRomInfo, bonzeadvRomName, NULL, NULL, NULL, NULL, BonzeadvInputInfo, BonzeadvDIPInfo,
@@ -2515,7 +2515,7 @@ struct BurnDriver BurnDrvBonzeadv = {
 };
 
 
-// Bonze Adventure (World, older)
+// Bonze Adventure (World)
 
 static struct BurnRomInfo bonzeadvoRomDesc[] = {
 	{ "b41-09.17",			0x10000, 0x06818710, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -2540,7 +2540,7 @@ STD_ROM_FN(bonzeadvo)
 
 struct BurnDriver BurnDrvBonzeadvo = {
 	"bonzeadvo", "bonzeadv", "cchip", NULL, "1988",
-	"Bonze Adventure (World, older)\0", NULL, "Taito Corporation Japan", "Taito Misc",
+	"Bonze Adventure (World)\0", NULL, "Taito Corporation Japan", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_RUNGUN, 0,
 	NULL, bonzeadvoRomInfo, bonzeadvoRomName, NULL, NULL, NULL, NULL, BonzeadvInputInfo, BonzeadvDIPInfo,
@@ -2549,7 +2549,7 @@ struct BurnDriver BurnDrvBonzeadvo = {
 };
 
 
-// Bonze Adventure (US)
+// Bonze Adventure (US, rev 1)
 
 static struct BurnRomInfo bonzeadvuRomDesc[] = {
 	{ "b41-09-1.17",		0x10000, 0xaf821fbc, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -2574,7 +2574,7 @@ STD_ROM_FN(bonzeadvu)
 
 struct BurnDriver BurnDrvBonzeadvu = {
 	"bonzeadvu", "bonzeadv", "cchip", NULL, "1988",
-	"Bonze Adventure (US)\0", NULL, "Taito America Corporation", "Taito Misc",
+	"Bonze Adventure (US, rev 1)\0", NULL, "Taito America Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_RUNGUN, 0,
 	NULL, bonzeadvuRomInfo, bonzeadvuRomName, NULL, NULL, NULL, NULL, BonzeadvInputInfo, JigkmgriDIPInfo,
@@ -2688,7 +2688,7 @@ struct BurnDriver BurnDrvBonzeadvp2 = {
 };
 
 
-// Jigoku Meguri (Japan)
+// Jigoku Meguri (Japan, rev 1)
 
 static struct BurnRomInfo jigkmgriRomDesc[] = {
 	{ "b41-09-1.17",		0x10000, 0xaf821fbc, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
@@ -2714,7 +2714,7 @@ STD_ROM_FN(jigkmgri)
 struct BurnDriver BurnDrvJigkmgri = {
 	"jigkmgri", "bonzeadv", "cchip", NULL, "1988",
 	"Jigoku Meguri (Japan)\0", NULL, "Taito Corporation", "Taito Misc",
-	L"\u5730\u7344\u3081\u3050\u308A\0Jigoku Meguri (Japan)\0", NULL, NULL, NULL,
+	L"\u5730\u7344\u3081\u3050\u308A\0Jigoku Meguri (Japan, rev 1)\0", NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_RUNGUN, 0,
 	NULL, jigkmgriRomInfo, jigkmgriRomName, NULL, NULL, NULL, NULL, BonzeadvInputInfo, JigkmgriDIPInfo,
 	BonzeInit, TaitoExit, BonzeFrame, DrvDraw, DrvScan, NULL, 0x1000,
@@ -2722,6 +2722,41 @@ struct BurnDriver BurnDrvJigkmgri = {
 };
 
 
+// Jigoku Meguri (Japan)
+
+static struct BurnRomInfo jigkmgriaRomDesc[] = {
+	{ "b41-09.17",			0x10000, 0x06818710, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  0 68K Code
+	{ "b41-11.26",			0x10000, 0x33c4c2f4, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  1
+	{ "b41-10.16",			0x10000, 0x4ca94d77, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  2
+	{ "b41-12.25",			0x10000, 0x40d9c1fc, BRF_PRG | BRF_ESS | TAITO_68KROM1_BYTESWAP },	//  3
+	{ "b41-01.15",			0x80000, 0x5d072fa4, BRF_PRG | BRF_ESS | TAITO_68KROM1 },			//  4
+
+	{ "b41-13.20",			0x10000, 0x9e464254, BRF_PRG | BRF_ESS | TAITO_Z80ROM1 },			//  5 Z80 Code
+
+	{ "b41-03.1",			0x80000, 0x736d35d0, BRF_GRA | TAITO_CHARS },						//  6 Characters
+
+	{ "b41-02.7",			0x80000, 0x29f205d9, BRF_GRA | TAITO_SPRITESA },					//  7 Sprites
+
+	{ "b41-04.48",			0x80000, 0xc668638f, BRF_SND | TAITO_YM2610A },						//  8 YM2610 Samples
+
+	{ "cchip_b41-05.43",	0x02000, 0x75c52553, BRF_ESS | BRF_PRG | TAITO_CCHIP_EEPROM },		//  9 CCHIP EEPROM
+};
+
+STDROMPICKEXT(jigkmgria, jigkmgria, cchip)
+STD_ROM_FN(jigkmgria)
+
+struct BurnDriver BurnDrvJigkmgria = {
+	"jigkmgria", "bonzeadv", "cchip", NULL, "1988",
+	"Jigoku Meguri (Japan)\0", NULL, "Taito Corporation", "Taito Misc",
+	L"\u5730\u7344\u3081\u3050\u308A\0Jigoku Meguri (Japan)\0", NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_RUNGUN, 0,
+	NULL, jigkmgriaRomInfo, jigkmgriaRomName, NULL, NULL, NULL, NULL, BonzeadvInputInfo, JigkmgriDIPInfo,
+	BonzeInit, TaitoExit, BonzeFrame, DrvDraw, DrvScan, NULL, 0x1000,
+	320, 224, 4, 3
+};
+
+
+#if 0
 // Jigoku Meguri (Japan, hack?)
 /* Copyright year has been removed */
 
@@ -2755,3 +2790,4 @@ struct BurnDriver BurnDrvJigkmgria = {
 	BonzeInit, TaitoExit, BonzeFrame, DrvDraw, DrvScan, NULL, 0x1000,
 	320, 224, 4, 3
 };
+#endif // 0
diff --git a/src/burn/drv/taito/d_darius2.cpp b/src/burn/drv/taito/d_darius2.cpp
index 1cf5c8199..dac3bee24 100644
--- a/src/burn/drv/taito/d_darius2.cpp
+++ b/src/burn/drv/taito/d_darius2.cpp
@@ -1970,7 +1970,7 @@ static INT32 Darius2Scan(INT32 nAction, INT32 *pnMin)
 
 struct BurnDriver BurnDrvDarius2 = {
 	"darius2", NULL, NULL, NULL, "1989",
-	"Darius II (triple screen) (Japan)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Darius II (triple screen) (Japan, rev 1)\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0,
 	NULL, Darius2RomInfo, Darius2RomName, NULL, NULL, NULL, NULL, Darius2InputInfo, Darius2DIPInfo,
diff --git a/src/burn/drv/taito/d_flstory.cpp b/src/burn/drv/taito/d_flstory.cpp
index 92e01a256..ebaa1dde9 100644
--- a/src/burn/drv/taito/d_flstory.cpp
+++ b/src/burn/drv/taito/d_flstory.cpp
@@ -1420,7 +1420,7 @@ struct BurnDriver BurnDrvFlstoryo = {
 };
 
 
-// Onna Sansirou - Typhoon Gal (set 1)
+// Onna Sansirou - Typhoon Gal (rev 1)
 
 static struct BurnRomInfo onna34roRomDesc[] = {
 	{ "a52-01-1.40c",	0x4000, 0xffddcb02, 1 | BRF_PRG | BRF_ESS }, //  0 maincpu
@@ -1458,7 +1458,7 @@ static INT32 onna34roInit()
 
 struct BurnDriver BurnDrvOnna34ro = {
 	"onna34ro", NULL, NULL, NULL, "1985",
-	"Onna Sanshirou - Typhoon Gal\0", NULL, "Taito", "Miscellaneous",
+	"Onna Sanshirou - Typhoon Gal (rev 1)\0", NULL, "Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, onna34roRomInfo, onna34roRomName, NULL, NULL, NULL, NULL, Onna34roInputInfo, Onna34roDIPInfo,
@@ -1467,9 +1467,9 @@ struct BurnDriver BurnDrvOnna34ro = {
 };
 
 
-// Onna Sansirou - Typhoon Gal (set 2)
+// Onna Sanshirou - Typhoon Gal (bootleg)
 
-static struct BurnRomInfo onna34raRomDesc[] = {
+static struct BurnRomInfo onna34roaRomDesc[] = {
 	{ "ry-08.rom",		0x4000, 0xe4587b85, 1 | BRF_PRG | BRF_ESS }, //  0 maincpu
 	{ "ry-07.rom",		0x4000, 0x6ffda515, 1 | BRF_PRG | BRF_ESS }, //  1
 	{ "ry-06.rom",		0x4000, 0x6fefcda8, 1 | BRF_PRG | BRF_ESS }, //  2
@@ -1490,8 +1490,8 @@ static struct BurnRomInfo onna34raRomDesc[] = {
 	{ "a52-11.32v",		0x4000, 0xd1dda6b3, 3 | BRF_GRA }, // 15
 };
 
-STD_ROM_PICK(onna34ra)
-STD_ROM_FN(onna34ra)
+STD_ROM_PICK(onna34roa)
+STD_ROM_FN(onna34roa)
 
 static INT32 onna34roaInit()
 {
@@ -1501,12 +1501,12 @@ static INT32 onna34roaInit()
 	return DrvInit();
 }
 
-struct BurnDriver BurnDrvOnna34ra = {
+struct BurnDriver BurnDrvOnna34roa = {
 	"onna34roa", "onna34ro", NULL, NULL, "1985",
 	"Onna Sanshirou - Typhoon Gal (bootleg)\0", NULL, "Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
-	NULL, onna34raRomInfo, onna34raRomName, NULL, NULL, NULL, NULL, Onna34roInputInfo, Onna34roDIPInfo,
+	NULL, onna34roaRomInfo, onna34roaRomName, NULL, NULL, NULL, NULL, Onna34roInputInfo, Onna34roDIPInfo,
 	onna34roaInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200,
 	256, 224, 4, 3
 };
@@ -1577,7 +1577,7 @@ static INT32 rumbaInit()
 	return nRet;
 }
 
-// Rumba Lumber
+// Rumba Lumber (rev 1)
 
 static struct BurnRomInfo rumbaRomDesc[] = {
 	{ "a23_01-1.bin",	0x4000, 0x4bea6e18, 1 | BRF_PRG | BRF_ESS }, //  0 maincpu
@@ -1601,7 +1601,7 @@ STD_ROM_FN(rumba)
 
 struct BurnDriver BurnDrvRumba = {
 	"rumba", NULL, NULL, NULL, "1984",
-	"Rumba Lumber\0", NULL, "Taito", "Miscellaneous",
+	"Rumba Lumber (rev 1)\0", NULL, "Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_MAZE, 0,
 	NULL, rumbaRomInfo, rumbaRomName, NULL, NULL, NULL, NULL, RumbaInputInfo, RumbaDIPInfo,
diff --git a/src/burn/drv/taito/d_lkage.cpp b/src/burn/drv/taito/d_lkage.cpp
index 3716c12c8..b972fe037 100644
--- a/src/burn/drv/taito/d_lkage.cpp
+++ b/src/burn/drv/taito/d_lkage.cpp
@@ -1,4 +1,4 @@
-// FB Alpha Legend of Kage driver Module
+// FB Neo Legend of Kage driver Module
 // Based on MAME driver by Phil Stroffolino
 
 #include "tiles_generic.h"
@@ -873,7 +873,7 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin)
 }
 
 
-// The Legend of Kage
+// The Legend of Kage (rev 2)
 
 static struct BurnRomInfo lkageRomDesc[] = {
 	{ "a54-01-2.37",		0x8000, 0x60fd9734, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
@@ -903,7 +903,7 @@ STD_ROM_FN(lkage)
 
 struct BurnDriver BurnDrvLkage = {
 	"lkage", NULL, NULL, NULL, "1984",
-	"The Legend of Kage\0", NULL, "Taito Corporation", "Miscellaneous",
+	"The Legend of Kage (rev 2)\0", NULL, "Taito Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
 	NULL, lkageRomInfo, lkageRomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
@@ -912,9 +912,9 @@ struct BurnDriver BurnDrvLkage = {
 };
 
 
-// The Legend of Kage (older)
+// The Legend of Kage (rev 1)
 
-static struct BurnRomInfo lkageoRomDesc[] = {
+static struct BurnRomInfo lkageaRomDesc[] = {
 	{ "a54-01-1.37",		0x8000, 0x973da9c5, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "a54-02-1.38",		0x8000, 0x27b509da, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -937,23 +937,23 @@ static struct BurnRomInfo lkageoRomDesc[] = {
 	{ "pal16l8a-a54-14.35",	0x0104, 0xa89c644e, 7 | BRF_OPT },       	 // 13
 };
 
-STD_ROM_PICK(lkageo)
-STD_ROM_FN(lkageo)
+STD_ROM_PICK(lkagea)
+STD_ROM_FN(lkagea)
 
-struct BurnDriver BurnDrvLkageo = {
-	"lkageo", "lkage", NULL, NULL, "1984",
-	"The Legend of Kage (older)\0", NULL, "Taito Corporation", "Miscellaneous",
+struct BurnDriver BurnDrvLkagea = {
+	"lkagea", "lkage", NULL, NULL, "1984",
+	"The Legend of Kage (rev 1)\0", NULL, "Taito Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
-	NULL, lkageoRomInfo, lkageoRomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
+	NULL, lkageaRomInfo, lkageaRomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	240, 224, 4, 3
 };
 
 
-// The Legend of Kage (oldest)
+// The Legend of Kage
 
-static struct BurnRomInfo lkageo2RomDesc[] = {
+static struct BurnRomInfo lkagebRomDesc[] = {
 	{ "a54-01.37",			0x8000, 0x34eab2c5, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "a54-02.38",			0x8000, 0xea471d8a, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -976,15 +976,15 @@ static struct BurnRomInfo lkageo2RomDesc[] = {
 	{ "pal16l8a-a54-14.35", 0x0104, 0xa89c644e, 7 | BRF_OPT },  		 // 13
 };
 
-STD_ROM_PICK(lkageo2)
-STD_ROM_FN(lkageo2)
+STD_ROM_PICK(lkageb)
+STD_ROM_FN(lkageb)
 
-struct BurnDriver BurnDrvLkageo2 = {
-	"lkageo2", "lkage", NULL, NULL, "1984",
-	"The Legend of Kage (oldest)\0", NULL, "Taito Corporation", "Miscellaneous",
+struct BurnDriver BurnDrvLkageb = {
+	"lkageb", "lkage", NULL, NULL, "1984",
+	"The Legend of Kage\0", NULL, "Taito Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
-	NULL, lkageo2RomInfo, lkageo2RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
+	NULL, lkagebRomInfo, lkagebRomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	240, 224, 4, 3
 };
@@ -992,7 +992,7 @@ struct BurnDriver BurnDrvLkageo2 = {
 
 // The Legend of Kage (bootleg set 1)
 
-static struct BurnRomInfo lkagebRomDesc[] = {
+static struct BurnRomInfo lkagebl1RomDesc[] = {
 	{ "ic37_1",		0x8000, 0x05694f7b, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "ic38_2",		0x8000, 0x22efe29e, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -1008,30 +1008,30 @@ static struct BurnRomInfo lkagebRomDesc[] = {
 	{ "a54-10.2",	0x0200, 0x17dfbd14, 5 | BRF_OPT },           //  8 Prom (unused)
 };
 
-STD_ROM_PICK(lkageb)
-STD_ROM_FN(lkageb)
+STD_ROM_PICK(lkagebl1)
+STD_ROM_FN(lkagebl1)
 
-static INT32 LkagebInit()
+static INT32 Lkagebl1Init()
 {
 	Lkageb = 1;
 
 	return DrvInit();
 }
 
-struct BurnDriver BurnDrvLkageb = {
-	"lkageb", "lkage", NULL, NULL, "1984",
+struct BurnDriver BurnDrvLkagebl1 = {
+	"lkagebl1", "lkage", NULL, NULL, "1984",
 	"The Legend of Kage (bootleg set 1)\0", NULL, "bootleg", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
-	NULL, lkagebRomInfo, lkagebRomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
-	LkagebInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
+	NULL, lkagebl1RomInfo, lkagebl1RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
+	Lkagebl1Init, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	240, 224, 4, 3
 };
 
 
 // The Legend of Kage (bootleg set 2)
 
-static struct BurnRomInfo lkageb2RomDesc[] = {
+static struct BurnRomInfo lkagebl2RomDesc[] = {
 	{ "lok.a",		0x8000, 0x866df793, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "lok.b",		0x8000, 0xfba9400f, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -1047,15 +1047,15 @@ static struct BurnRomInfo lkageb2RomDesc[] = {
 	{ "a54-10.2",	0x0200, 0x17dfbd14, 5 | BRF_OPT },           //  8 Prom (unused)
 };
 
-STD_ROM_PICK(lkageb2)
-STD_ROM_FN(lkageb2)
+STD_ROM_PICK(lkagebl2)
+STD_ROM_FN(lkagebl2)
 
-struct BurnDriver BurnDrvLkageb2 = {
-	"lkageb2", "lkage", NULL, NULL, "1984",
+struct BurnDriver BurnDrvLkagebl2 = {
+	"lkagebl2", "lkage", NULL, NULL, "1984",
 	"The Legend of Kage (bootleg set 2)\0", NULL, "bootleg", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
-	NULL, lkageb2RomInfo, lkageb2RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
+	NULL, lkagebl2RomInfo, lkagebl2RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	240, 224, 4, 3
 };
@@ -1063,7 +1063,7 @@ struct BurnDriver BurnDrvLkageb2 = {
 
 // The Legend of Kage (bootleg set 3)
 
-static struct BurnRomInfo lkageb3RomDesc[] = {
+static struct BurnRomInfo lkagebl3RomDesc[] = {
 	{ "z1.bin",		0x8000, 0x60cac488, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "z2.bin",		0x8000, 0x22c95f17, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -1079,15 +1079,15 @@ static struct BurnRomInfo lkageb3RomDesc[] = {
 	{ "a54-10.2",	0x0200, 0x17dfbd14, 5 | BRF_OPT },           //  8 Prom (unused)
 };
 
-STD_ROM_PICK(lkageb3)
-STD_ROM_FN(lkageb3)
+STD_ROM_PICK(lkagebl3)
+STD_ROM_FN(lkagebl3)
 
-struct BurnDriver BurnDrvLkageb3 = {
-	"lkageb3", "lkage", NULL, NULL, "1984",
+struct BurnDriver BurnDrvLkagebl3 = {
+	"lkagebl3", "lkage", NULL, NULL, "1984",
 	"The Legend of Kage (bootleg set 3)\0", NULL, "bootleg", "hardware",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
-	NULL, lkageb3RomInfo, lkageb3RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
+	NULL, lkagebl3RomInfo, lkagebl3RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	240, 224, 4, 3
 };
@@ -1095,7 +1095,7 @@ struct BurnDriver BurnDrvLkageb3 = {
 
 // The Legend of Kage (bootleg set 4)
 
-static struct BurnRomInfo lkageb4RomDesc[] = {
+static struct BurnRomInfo lkagebl4RomDesc[] = {
 	{ "1.ic37",		0x8000, 0xfa20e863, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "2.ic38",		0x8000, 0xa5bdd3b4, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -1111,15 +1111,15 @@ static struct BurnRomInfo lkageb4RomDesc[] = {
 	{ "a54-10.2",	0x0200, 0x17dfbd14, 5 | BRF_OPT },           //  8 Prom (unused)
 };
 
-STD_ROM_PICK(lkageb4)
-STD_ROM_FN(lkageb4)
+STD_ROM_PICK(lkagebl4)
+STD_ROM_FN(lkagebl4)
 
-struct BurnDriver BurnDrvLkageb4 = {
-	"lkageb4", "lkage", NULL, NULL, "1984",
+struct BurnDriver BurnDrvLkagebl4 = {
+	"lkagebl4", "lkage", NULL, NULL, "1984",
 	"The Legend of Kage (bootleg set 4)\0", NULL, "bootleg", "hardware",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
-	NULL, lkageb4RomInfo, lkageb4RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
+	NULL, lkagebl4RomInfo, lkagebl4RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	240, 224, 4, 3
 };
diff --git a/src/burn/drv/taito/d_lsasquad.cpp b/src/burn/drv/taito/d_lsasquad.cpp
index 34af4204b..b5357dcf4 100644
--- a/src/burn/drv/taito/d_lsasquad.cpp
+++ b/src/burn/drv/taito/d_lsasquad.cpp
@@ -984,7 +984,7 @@ struct BurnDriver BurnDrvStorminga = {
 };
 
 
-// Daikaiju no Gyakushu
+// Daikaiju no Gyakushu (rev 1)
 
 static struct BurnRomInfo daikaijuRomDesc[] = {
 	{ "a74_01-1.ic4",	0x8000, 0x89c13d7f, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
@@ -1022,7 +1022,7 @@ static INT32 DaikaijuInit()
 
 struct BurnDriver BurnDrvDaikaiju = {
 	"daikaiju", NULL, NULL, NULL, "1986",
-	"Daikaiju no Gyakushu\0", NULL, "Taito", "Miscellaneous",
+	"Daikaiju no Gyakushu (rev 1)\0", NULL, "Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_RUNGUN, 0,
 	NULL, daikaijuRomInfo, daikaijuRomName, NULL, NULL, NULL, NULL, LsasquadInputInfo, DaikaijuDIPInfo,
diff --git a/src/burn/drv/taito/d_nycaptor.cpp b/src/burn/drv/taito/d_nycaptor.cpp
index 08ec0fed3..e2a657f2a 100644
--- a/src/burn/drv/taito/d_nycaptor.cpp
+++ b/src/burn/drv/taito/d_nycaptor.cpp
@@ -1065,7 +1065,7 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin)
 }
 
 
-// N.Y. Captor
+// N.Y. Captor (rev 2)
 
 static struct BurnRomInfo nycaptorRomDesc[] = {
 	{ "a50_04",			0x4000, 0x33d971a3, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
@@ -1101,7 +1101,7 @@ static INT32 NycaptorInit()
 
 struct BurnDriver BurnDrvNycaptor = {
 	"nycaptor", NULL, NULL, NULL, "1985",
-	"N.Y. Captor\0", NULL, "Taito", "Miscellaneous",
+	"N.Y. Captor (rev 2)\0", NULL, "Taito", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0,
 	NULL, nycaptorRomInfo, nycaptorRomName, NULL, NULL, NULL, NULL, NycaptorInputInfo, NycaptorDIPInfo,
diff --git a/src/burn/drv/taito/d_othunder.cpp b/src/burn/drv/taito/d_othunder.cpp
index 98f2d4019..08f8a9ac3 100644
--- a/src/burn/drv/taito/d_othunder.cpp
+++ b/src/burn/drv/taito/d_othunder.cpp
@@ -1095,7 +1095,7 @@ struct BurnDriver BurnDrvOthunderu = {
 	320, 240, 4, 3
 };
 
-static struct BurnRomInfo OthunderuoRomDesc[] = {
+static struct BurnRomInfo OthunderuaRomDesc[] = {
 	{ "b67-20.ic63",           0x20000, 0x21439ea2, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b67-22.ic64",           0x20000, 0x0f99ad3c, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b67-14.ic61",           0x20000, 0x7f3dd724, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
@@ -1124,15 +1124,15 @@ static struct BurnRomInfo OthunderuoRomDesc[] = {
 	{ "pal20l8b-b67-10.ic33",  0x00144, 0x4ced09c7, BRF_OPT },
 };
 
-STD_ROM_PICK(Othunderuo)
-STD_ROM_FN(Othunderuo)
+STD_ROM_PICK(Othunderua)
+STD_ROM_FN(Othunderua)
 
-struct BurnDriver BurnDrvOthunderuo = {
-	"othunderuo", "othunder", NULL, NULL, "1988",
+struct BurnDriver BurnDrvOthunderua = {
+	"othunderua", "othunder", NULL, NULL, "1988",
 	"Operation Thunderbolt (US)\0", NULL, "Taito America Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0,
-	NULL, OthunderuoRomInfo, OthunderuoRomName, NULL, NULL, NULL, NULL, OthunderInputInfo, OthunderuDIPInfo,
+	NULL, OthunderuaRomInfo, OthunderuaRomName, NULL, NULL, NULL, NULL, OthunderInputInfo, OthunderuDIPInfo,
 	OthunderInit, OthunderExit, OthunderFrame, OthunderDraw, OthunderScan, NULL, 0x1000,
 	320, 240, 4, 3
 };
diff --git a/src/burn/drv/taito/d_qix.cpp b/src/burn/drv/taito/d_qix.cpp
index fbdb6de6d..214e94bcc 100644
--- a/src/burn/drv/taito/d_qix.cpp
+++ b/src/burn/drv/taito/d_qix.cpp
@@ -1,4 +1,4 @@
-// FB Alpha Taito Qix driver module
+// FB Neo Taito Qix driver module
 // Based on MAME driver by Aaron Giles and Zsolt Vasvari
 
 #include "tiles_generic.h"
@@ -1620,7 +1620,7 @@ struct BurnDriver BurnDrvSdungeona = {
 };
 
 
-// Electric Yo-Yo, The (set 1)
+// Electric Yo-Yo, The (rev 1)
 
 static struct BurnRomInfo elecyoyoRomDesc[] = {
 	{ "yy14",			0x1000, 0x0d2edcb9, 1 | BRF_PRG | BRF_ESS }, //  0 Main M6809 Code
@@ -1647,7 +1647,7 @@ STD_ROM_FN(elecyoyo)
 
 struct BurnDriver BurnDrvElecyoyo = {
 	"elecyoyo", NULL, NULL, NULL, "1982",
-	"The Electric Yo-Yo (set 1)\0", NULL, "Taito America Corporation", "Miscellaneous",
+	"The Electric Yo-Yo (rev 1)\0", NULL, "Taito America Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_MISC, GBF_ACTION, 0,
 	NULL, elecyoyoRomInfo, elecyoyoRomName, NULL, NULL, NULL, NULL, ElecyoyoInputInfo, NULL,
@@ -1656,9 +1656,9 @@ struct BurnDriver BurnDrvElecyoyo = {
 };
 
 
-// Electric Yo-Yo, The (set 2)
+// The Electric Yo-Yo
 
-static struct BurnRomInfo elecyoyo2RomDesc[] = {
+static struct BurnRomInfo elecyoyoaRomDesc[] = {
 	{ "yy14",			0x1000, 0x0d2edcb9, 1 | BRF_PRG | BRF_ESS }, //  0 Main M6809 Code
 	{ "yy15",			0x1000, 0xa91f01e3, 1 | BRF_PRG | BRF_ESS }, //  1
 	{ "yy16",			0x1000, 0xcab19f3a, 1 | BRF_PRG | BRF_ESS }, //  2
@@ -1678,21 +1678,21 @@ static struct BurnRomInfo elecyoyo2RomDesc[] = {
 	{ "yy101",			0x0800, 0x3cf13038, 4 | BRF_PRG | BRF_ESS }, // 13 MCU (M68705) Code
 };
 
-STD_ROM_PICK(elecyoyo2)
-STD_ROM_FN(elecyoyo2)
+STD_ROM_PICK(elecyoyoa)
+STD_ROM_FN(elecyoyoa)
 
-struct BurnDriver BurnDrvElecyoyo2 = {
-	"elecyoyo2", "elecyoyo", NULL, NULL, "1982",
-	"The Electric Yo-Yo (set 2)\0", NULL, "Taito America Corporation", "Miscellaneous",
+struct BurnDriver BurnDrvElecyoyoa = {
+	"elecyoyoa", "elecyoyo", NULL, NULL, "1982",
+	"The Electric Yo-Yo\0", NULL, "Taito America Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_MISC, GBF_ACTION, 0,
-	NULL, elecyoyo2RomInfo, elecyoyo2RomName, NULL, NULL, NULL, NULL, ElecyoyoInputInfo, NULL,
+	NULL, elecyoyoaRomInfo, elecyoyoaRomName, NULL, NULL, NULL, NULL, ElecyoyoInputInfo, NULL,
 	FourWayInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	240, 256, 3, 4
 };
 
 
-// Kram (set 1)
+// Kram (rev 1)
 
 static struct BurnRomInfo kramRomDesc[] = {
 	{ "ks14-1",			0x1000, 0xfe69ac79, 1 | BRF_PRG | BRF_ESS }, //  0 Main M6809 Code
@@ -1719,7 +1719,7 @@ STD_ROM_FN(kram)
 
 struct BurnDriver BurnDrvKram = {
 	"kram", NULL, NULL, NULL, "1982",
-	"Kram (set 1)\0", NULL, "Taito America Corporation", "Miscellaneous",
+	"Kram (rev 1)\0", NULL, "Taito America Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_ACTION, 0,
 	NULL, kramRomInfo, kramRomName, NULL, NULL, NULL, NULL, KramInputInfo, NULL,
@@ -1728,9 +1728,9 @@ struct BurnDriver BurnDrvKram = {
 };
 
 
-// Kram (set 2)
+// Kram
 
-static struct BurnRomInfo kram2RomDesc[] = {
+static struct BurnRomInfo kramaRomDesc[] = {
 	{ "ks14",			0x1000, 0xa2eac1ff, 1 | BRF_PRG | BRF_ESS }, //  0 Main M6809 Code
 	{ "ks15",			0x1000, 0x4b2c175e, 1 | BRF_PRG | BRF_ESS }, //  1
 	{ "ks16",			0x1000, 0x9500a05d, 1 | BRF_PRG | BRF_ESS }, //  2
@@ -1750,15 +1750,15 @@ static struct BurnRomInfo kram2RomDesc[] = {
 	{ "ks101.dat",		0x0800, 0xe53d97b7, 4 | BRF_PRG | BRF_ESS }, // 13 MCU (M68705) Code
 };
 
-STD_ROM_PICK(kram2)
-STD_ROM_FN(kram2)
+STD_ROM_PICK(krama)
+STD_ROM_FN(krama)
 
-struct BurnDriver BurnDrvKram2 = {
-	"kram2", "kram", NULL, NULL, "1982",
-	"Kram (set 2)\0", NULL, "Taito America Corporation", "Miscellaneous",
+struct BurnDriver BurnDrvKrama = {
+	"krama", "kram", NULL, NULL, "1982",
+	"Kram\0", NULL, "Taito America Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_ACTION, 0,
-	NULL, kram2RomInfo, kram2RomName, NULL, NULL, NULL, NULL, KramInputInfo, NULL,
+	NULL, kramaRomInfo, kramaRomName, NULL, NULL, NULL, NULL, KramInputInfo, NULL,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	256, 240, 4, 3
 };
@@ -1766,7 +1766,7 @@ struct BurnDriver BurnDrvKram2 = {
 
 // Kram (encrypted)
 
-static struct BurnRomInfo kram3RomDesc[] = {
+static struct BurnRomInfo krameRomDesc[] = {
 	{ "kr-u14",			0x1000, 0x02c1bd1e, 1 | BRF_PRG | BRF_ESS }, //  0 Main M6809 Code
 	{ "kr-u15",			0x1000, 0x46b3ff33, 1 | BRF_PRG | BRF_ESS }, //  1
 	{ "kr-u16",			0x1000, 0xf202b9cf, 1 | BRF_PRG | BRF_ESS }, //  2
@@ -1784,15 +1784,15 @@ static struct BurnRomInfo kram3RomDesc[] = {
 	{ "ks27",			0x0800, 0xc46530c8, 3 | BRF_PRG | BRF_ESS }, // 12 Sound M6802 Code
 };
 
-STD_ROM_PICK(kram3)
-STD_ROM_FN(kram3)
+STD_ROM_PICK(krame)
+STD_ROM_FN(krame)
 
-struct BurnDriverX BurnDrvKram3 = {
-	"kram3", "kram", NULL, NULL, "1982",
+struct BurnDriverX BurnDrvKrame = {
+	"krame", "kram", NULL, NULL, "1982",
 	"Kram (encrypted)\0", NULL, "Taito America Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_NOT_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_ACTION, 0,
-	NULL, kram3RomInfo, kram3RomName, NULL, NULL, NULL, NULL, KramInputInfo, NULL,
+	NULL, krameRomInfo, krameRomName, NULL, NULL, NULL, NULL, KramInputInfo, NULL,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	256, 240, 4, 3
 };
diff --git a/src/burn/drv/taito/d_taitof2.cpp b/src/burn/drv/taito/d_taitof2.cpp
index 34776c0af..bf0d4206b 100644
--- a/src/burn/drv/taito/d_taitof2.cpp
+++ b/src/burn/drv/taito/d_taitof2.cpp
@@ -11204,7 +11204,7 @@ struct BurnDriver BurnDrvDinorexu = {
 
 struct BurnDriver BurnDrvDondokod = {
 	"dondokod", NULL, NULL, NULL, "1989",
-	"Don Doko Don (World)\0", NULL, "Taito Corporation Japan", "Taito F2",
+	"Don Doko Don (World, rev 1)\0", NULL, "Taito Corporation Japan", "Taito F2",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOF2, GBF_PLATFORM, 0,
 	NULL, DondokodRomInfo, DondokodRomName, NULL, NULL, NULL, NULL, DondokodInputInfo, DondokodDIPInfo,
@@ -11214,7 +11214,7 @@ struct BurnDriver BurnDrvDondokod = {
 
 struct BurnDriver BurnDrvDondokodj = {
 	"dondokodj", "dondokod", NULL, NULL, "1989",
-	"Don Doko Don (Japan)\0", NULL, "Taito Corporation", "Taito F2",
+	"Don Doko Don (Japan, rev 1)\0", NULL, "Taito Corporation", "Taito F2",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOF2, GBF_PLATFORM, 0,
 	NULL, DondokodjRomInfo, DondokodjRomName, NULL, NULL, NULL, NULL, DondokodInputInfo, DondokodjDIPInfo,
@@ -11224,7 +11224,7 @@ struct BurnDriver BurnDrvDondokodj = {
 
 struct BurnDriver BurnDrvDondokodu = {
 	"dondokodu", "dondokod", NULL, NULL, "1989",
-	"Don Doko Don (US)\0", NULL, "Taito America Corporation", "Taito F2",
+	"Don Doko Don (US, rev 1)\0", NULL, "Taito America Corporation", "Taito F2",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOF2, GBF_PLATFORM, 0,
 	NULL, DondokoduRomInfo, DondokoduRomName, NULL, NULL, NULL, NULL, DondokodInputInfo, DondokoduDIPInfo,
@@ -11284,7 +11284,7 @@ struct BurnDriver BurnDrvFinalbj = {
 
 struct BurnDriver BurnDrvFinalbu = {
 	"finalbu", "finalb", NULL, NULL, "1988",
-	"Final Blow (US)\0", NULL, "Taito America Corporation", "Taito F2",
+	"Final Blow (US, rev 1)\0", NULL, "Taito America Corporation", "Taito F2",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOF2, GBF_VSFIGHT, 0,
 	NULL, FinalbuRomInfo, FinalbuRomName, NULL, NULL, NULL, NULL, FinalbInputInfo, FinalbjDIPInfo,
@@ -11734,7 +11734,7 @@ struct BurnDriver BurnDrvMajest12j = {
 
 struct BurnDriver BurnDrvThundfox = {
 	"thundfox", NULL, NULL, NULL, "1990",
-	"Thunder Fox (World)\0", NULL, "Taito Corporation Japan", "Taito F2",
+	"Thunder Fox (World, rev 1)\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, ThundfoxRomInfo, ThundfoxRomName, NULL, NULL, NULL, NULL, ThundfoxInputInfo, ThundfoxDIPInfo,
@@ -11744,7 +11744,7 @@ struct BurnDriver BurnDrvThundfox = {
 
 struct BurnDriver BurnDrvThundfoxj = {
 	"thundfoxj", "thundfox", NULL, NULL, "1990",
-	"Thunder Fox (Japan)\0", NULL, "Taito Corporation", "Taito F2",
+	"Thunder Fox (Japan, rev 1)\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, ThundfoxjRomInfo, ThundfoxjRomName, NULL, NULL, NULL, NULL, ThundfoxInputInfo, ThundfoxjDIPInfo,
@@ -11754,7 +11754,7 @@ struct BurnDriver BurnDrvThundfoxj = {
 
 struct BurnDriver BurnDrvThundfoxu = {
 	"thundfoxu", "thundfox", NULL, NULL, "1990",
-	"Thunder Fox (US)\0", NULL, "Taito America Corporation", "Taito F2",
+	"Thunder Fox (US, rev 1)\0", NULL, "Taito America Corporation", "Taito F2",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOF2, GBF_SCRFIGHT, 0,
 	NULL, ThundfoxuRomInfo, ThundfoxuRomName, NULL, NULL, NULL, NULL, ThundfoxInputInfo, ThundfoxuDIPInfo,
diff --git a/src/burn/drv/taito/d_taitoh.cpp b/src/burn/drv/taito/d_taitoh.cpp
index 8e1ea3201..d54652249 100644
--- a/src/burn/drv/taito/d_taitoh.cpp
+++ b/src/burn/drv/taito/d_taitoh.cpp
@@ -1,4 +1,4 @@
-// FB Alpha Taito System H driver module
+// FB Neo Taito System H driver module
 // Based on MAME driver by Yochizo and Nicola Salmoria
 
 // Weirdness:
@@ -2131,7 +2131,7 @@ struct BurnDriver BurnDrvGogold = {
 };
 
 
-// Tetris (Japan, Taito H-System)
+// Tetris (Japan, rev 1, Taito H-System)
 
 static struct BurnRomInfo tetristhRomDesc[] = {
 	{ "c26-12-1.ic36",	0x20000, 0x77e80c82, TAITO_68KROM1_BYTESWAP }, //  0 68k Code
@@ -2160,7 +2160,7 @@ STD_ROM_FN(tetristh)
 
 struct BurnDriver BurnDrvTetristh = {
 	"tetristh", "tetris", NULL, NULL, "1988",
-	"Tetris (Japan, Taito H-System)\0", NULL, "Sega", "Taito H System",
+	"Tetris (Japan, rev 1, Taito H-System)\0", NULL, "Sega", "Taito H System",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0,
 	NULL, tetristhRomInfo, tetristhRomName, NULL, NULL, NULL, NULL, TetristhInputInfo, TetristhDIPInfo,
diff --git a/src/burn/drv/taito/d_taitol.cpp b/src/burn/drv/taito/d_taitol.cpp
index 570cb97fd..28318f9b2 100644
--- a/src/burn/drv/taito/d_taitol.cpp
+++ b/src/burn/drv/taito/d_taitol.cpp
@@ -3017,7 +3017,7 @@ static INT32 DrvExit()
 
 	TaitoICExit();
 
-	BurnFree (AllMem);
+	BurnFreeMemIndex();
 
 	return 0;
 }
@@ -3427,7 +3427,7 @@ static INT32 DrvScan(INT32 nAction,INT32 *pnMin)
 }
 
 
-// Raimais (World)
+// Raimais (World, rev 1)
 
 static struct BurnRomInfo raimaisRomDesc[] = {
 	{ "b36_11-1.ic7",	0x20000, 0xf19fb0d5, 1 | BRF_PRG | BRF_ESS }, //  0 main z80 code
@@ -3451,7 +3451,7 @@ STD_ROM_FN(raimais)
 
 struct BurnDriver BurnDrvRaimais = {
 	"raimais", NULL, NULL, NULL, "1988",
-	"Raimais (World)\0", NULL, "Taito Corporation Japan", "Taito L System",
+	"Raimais (World, rev 1)\0", NULL, "Taito Corporation Japan", "Taito L System",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_MAZE, 0,
 	NULL, raimaisRomInfo, raimaisRomName, NULL, NULL, NULL, NULL, FhawkInputInfo, RaimaisDIPInfo,
@@ -3460,7 +3460,7 @@ struct BurnDriver BurnDrvRaimais = {
 };
 
 
-// Raimais (Japan)
+// Raimais (Japan, rev 1)
 
 static struct BurnRomInfo raimaisjRomDesc[] = {
 	{ "b36_08-1.ic7",	0x20000, 0x6cc8f79f, 1 | BRF_PRG | BRF_ESS }, //  0 main z80 code
@@ -3484,7 +3484,7 @@ STD_ROM_FN(raimaisj)
 
 struct BurnDriver BurnDrvRaimaisj = {
 	"raimaisj", "raimais", NULL, NULL, "1988",
-	"Raimais (Japan)\0", NULL, "Taito Corporation", "Taito L System",
+	"Raimais (Japan, rev 1)\0", NULL, "Taito Corporation", "Taito L System",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_MAZE, 0,
 	NULL, raimaisjRomInfo, raimaisjRomName, NULL, NULL, NULL, NULL, FhawkInputInfo, RaimaisjDIPInfo,
@@ -3493,7 +3493,7 @@ struct BurnDriver BurnDrvRaimaisj = {
 };
 
 
-// Raimais (Japan, first revision)
+// Raimais (Japan)
 
 static struct BurnRomInfo raimaisjoRomDesc[] = {
 	{ "b36_08.ic7",		0x20000, 0xf40b9178, 1 | BRF_PRG | BRF_ESS }, //  0 main z80 code
@@ -3517,7 +3517,7 @@ STD_ROM_FN(raimaisjo)
 
 struct BurnDriver BurnDrvRaimaisjo = {
 	"raimaisjo", "raimais", NULL, NULL, "1988",
-	"Raimais (Japan, first revision)\0", NULL, "Taito Corporation", "Taito L System",
+	"Raimais (Japan)\0", NULL, "Taito Corporation", "Taito L System",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_MAZE, 0,
 	NULL, raimaisjoRomInfo, raimaisjoRomName, NULL, NULL, NULL, NULL, FhawkInputInfo, RaimaisjDIPInfo,
diff --git a/src/burn/drv/taito/d_taitomisc.cpp b/src/burn/drv/taito/d_taitomisc.cpp
index 9c9540755..d5de652e6 100644
--- a/src/burn/drv/taito/d_taitomisc.cpp
+++ b/src/burn/drv/taito/d_taitomisc.cpp
@@ -6118,7 +6118,7 @@ struct BurnDriver BurnDrvDariuse = {
 
 struct BurnDriver BurnDrvOpwolf = {
 	"opwolf", NULL, "cchip", NULL, "1987",
-	"Operation Wolf (World, set 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
+	"Operation Wolf (World, rev 2, set 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0,
 	NULL, OpwolfRomInfo, OpwolfRomName, NULL, NULL, NULL, NULL, OpwolfInputInfo, OpwolfDIPInfo,
@@ -6128,7 +6128,7 @@ struct BurnDriver BurnDrvOpwolf = {
 
 struct BurnDriver BurnDrvOpwolfa = {
 	"opwolfa", "opwolf", "cchip", NULL, "1987",
-	"Operation Wolf (World, set 2)\0", NULL, "Taito Corporation Japan", "Taito Misc",
+	"Operation Wolf (World, rev 2, set 2)\0", NULL, "Taito Corporation Japan", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0,
 	NULL, OpwolfaRomInfo, OpwolfaRomName, NULL, NULL, NULL, NULL, OpwolfInputInfo, OpwolfDIPInfo,
@@ -6138,7 +6138,7 @@ struct BurnDriver BurnDrvOpwolfa = {
 
 struct BurnDriver BurnDrvOpwolfj = {
 	"opwolfj", "opwolf", "cchip", NULL, "1987",
-	"Operation Wolf (Japan)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Operation Wolf (Japan, rev 2)\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0,
 	NULL, OpwolfjRomInfo, OpwolfjRomName, NULL, NULL, NULL, NULL, OpwolfInputInfo, OpwolfDIPInfo,
@@ -6158,7 +6158,7 @@ struct BurnDriver BurnDrvOpwolfjsc = {
 
 struct BurnDriver BurnDrvOpwolfu = {
 	"opwolfu", "opwolf", "cchip", NULL, "1987",
-	"Operation Wolf (US)\0", NULL, "Taito America Corporation", "Taito Misc",
+	"Operation Wolf (US, rev 2)\0", NULL, "Taito America Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0,
 	NULL, OpwolfuRomInfo, OpwolfuRomName, NULL, NULL, NULL, NULL, OpwolfInputInfo, OpwolfuDIPInfo,
@@ -6178,7 +6178,7 @@ struct BurnDriver BurnDrvOpwolfb = {
 
 struct BurnDriver BurnDrvRbisland = {
 	"rbisland", NULL, "cchip", NULL, "1987",
-	"Rainbow Islands (new version)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Rainbow Islands (rev 1)\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0,
 	NULL, RbislandRomInfo, RbislandRomName, NULL, NULL, NULL, NULL, RbislandInputInfo, RbislandDIPInfo,
@@ -6188,7 +6188,7 @@ struct BurnDriver BurnDrvRbisland = {
 
 struct BurnDriver BurnDrvRbislando = {
 	"rbislando", "rbisland", "cchip", NULL, "1987",
-	"Rainbow Islands (old version)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Rainbow Islands\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0,
 	NULL, RbislandoRomInfo, RbislandoRomName, NULL, NULL, NULL, NULL, RbislandInputInfo, RbislandDIPInfo,
@@ -6338,7 +6338,7 @@ struct BurnDriver BurnDrvRastsagab = {
 
 struct BurnDriver BurnDrvTopspeed = {
 	"topspeed", NULL, NULL, NULL, "1987",
-	"Top Speed (World)\0", NULL, "Taito Corporation Japan", "Taito Misc",
+	"Top Speed (World, rev 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_RACING, 0,
 	NULL, TopspeedRomInfo, TopspeedRomName, NULL, NULL, NULL, NULL, TopspeedInputInfo, TopspeedDIPInfo,
@@ -6368,7 +6368,7 @@ struct BurnDriver BurnDrvFullthrl = {
 
 struct BurnDriver BurnDrvVolfied = {
 	"volfied", NULL, "cchip", NULL, "1989",
-	"Volfied (World, revision 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
+	"Volfied (World, rev 1)\0", NULL, "Taito Corporation Japan", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0,
 	NULL, VolfiedRomInfo, VolfiedRomName, NULL, NULL, NULL, NULL, VolfiedInputInfo, VolfiedDIPInfo,
@@ -6378,7 +6378,7 @@ struct BurnDriver BurnDrvVolfied = {
 
 struct BurnDriver BurnDrvVolfiedj = {
 	"volfiedj", "volfied", "cchip", NULL, "1989",
-	"Volfied (Japan, revision 1)\0", NULL, "Taito Corporation", "Taito Misc",
+	"Volfied (Japan, rev 1)\0", NULL, "Taito Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0,
 	NULL, VolfiedjRomInfo, VolfiedjRomName, NULL, NULL, NULL, NULL, VolfiedInputInfo, VolfiedjDIPInfo,
@@ -6398,7 +6398,7 @@ struct BurnDriver BurnDrvVolfiedjo = {
 
 struct BurnDriver BurnDrvVolfiedu = {
 	"volfiedu", "volfied", "cchip", NULL, "1989",
-	"Volfied (US, revision 1)\0", NULL, "Taito America Corporation", "Taito Misc",
+	"Volfied (US, rev 1)\0", NULL, "Taito America Corporation", "Taito Misc",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0,
 	NULL, VolfieduRomInfo, VolfieduRomName, NULL, NULL, NULL, NULL, VolfiedInputInfo, VolfieduDIPInfo,