From 417b9d61d43960d3a631453a6beeda6045001006 Mon Sep 17 00:00:00 2001
From: barbudreadmon <barbudreadmon@gmail.com>
Date: Sun, 27 Oct 2024 09:46:25 +0100
Subject: [PATCH] (libretro) update files

---
 ... Neo (ClrMame Pro XML, FDS Games only).dat | 158 ++++++----
 ... Neo (ClrMame Pro XML, NES Games only).dat | 296 +++++++++---------
 gamelist.txt                                  |  70 +++--
 src/burner/libretro/romdata.cpp               |   2 +-
 src/dep/generated/driverlist.h                |  74 +++--
 5 files changed, 340 insertions(+), 260 deletions(-)

diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, FDS Games only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, FDS Games only).dat
index d714cb616..239a7eec8 100644
--- a/dats/FinalBurn Neo (ClrMame Pro XML, FDS Games only).dat	
+++ b/dats/FinalBurn Neo (ClrMame Pro XML, FDS Games only).dat	
@@ -91,7 +91,7 @@
 		<description>Aliens - Alien 2 (Fix Hack)</description>
 		<year>2017</year>
 		<manufacturer>lancuster</manufacturer>
-		<rom name="Aliens - Alien 2 (Prototype)(Fix Hack).fds" size="131016" crc="0d487b19"/>
+		<rom name="Aliens - Alien 2 (Proto, Fix Hack)(2017)(lancuster).fds" size="131016" crc="0d487b19"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -100,8 +100,8 @@
 		<comment>Prototype</comment>
 		<description>Aliens - Alien 2 (Japan) (Prototype)</description>
 		<year>1987</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="Aliens - Alien 2 (J) (Prototype).fds" size="131000" crc="2b779ee3"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Aliens - Alien 2 (Japan, Proto)(1987)(Squaresoft).fds" size="131000" crc="2b779ee3"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -229,7 +229,7 @@
 		<description>Bubble Bobble (Japan)</description>
 		<year>1988</year>
 		<manufacturer>Taito Corp.</manufacturer>
-		<rom name="Bubble Bobble (Japan)(1988)(Taito Corp.).fds" size="131000" crc="8c8d153e"/>
+		<rom name="Bubble Bobble (Japan)(1988)(Taito).fds" size="131000" crc="8c8d153e"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -247,7 +247,7 @@
 		<description>Chitei Tairiku Ordola (Japan)</description>
 		<year>1987</year>
 		<manufacturer>Sunsoft</manufacturer>
-		<rom name="Chitei Tairiku Ordola (Japan).fds" size="131000" crc="aacd4f64"/>
+		<rom name="Chitei Tairiku Ordola (Japan)(1987)(Sunsoft).fds" size="131000" crc="aacd4f64"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -256,7 +256,7 @@
 		<description>Clu Clu Land (Japan)</description>
 		<year>1988</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Clu Clu Land (Japan).fds" size="65516" crc="72d0bde6"/>
+		<rom name="Clu Clu Land (Japan)(1988)(Nintendo).fds" size="65516" crc="72d0bde6"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -265,7 +265,17 @@
 		<description>Cocona World (Japan)</description>
 		<year>1987</year>
 		<manufacturer>Sofel</manufacturer>
-		<rom name="Cocona World (Japan).fds" size="131016" crc="0b429e6c"/>
+		<rom name="Cocona World (Japan)(1987)(Sofel).fds" size="131016" crc="0b429e6c"/>
+		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
+	<game name="crystaldrag" romof="fdsbios" sourcefile="nes/d_nes.cpp">
+		<comment>Hack</comment>
+		<description>Crystal Dragon (Hack, English)</description>
+		<year>2003</year>
+		<manufacturer>Mute</manufacturer>
+		<rom name="Suishou no Dragon - Crystal Dragon T-Eng (2003)(Mute).fds" size="131000" crc="f106f568"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -275,7 +285,7 @@
 		<description>Dandy - Zeuon no Fukkatsu (Hack, English)</description>
 		<year>2021</year>
 		<manufacturer>Stardust Crusaders</manufacturer>
-		<rom name="Dandy - Zeuon no Fukkatsu (T-Eng).fds" size="131383" crc="29a1613f"/>
+		<rom name="Dandy - Zeuon no Fukkatsu T-Eng (2021)(Stardust Crusaders).fds" size="131383" crc="29a1613f"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -284,7 +294,7 @@
 		<description>Dandy - Zeuon no Fukkatsu (Japan)</description>
 		<year>1988</year>
 		<manufacturer>Pony Canyon</manufacturer>
-		<rom name="Dandy - Zeuon no Fukkatsu (Japan).fds" size="131016" crc="a2bfcbcc"/>
+		<rom name="Dandy - Zeuon no Fukkatsu (Japan)(1988)(Pony Canyon).fds" size="131016" crc="a2bfcbcc"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -294,7 +304,7 @@
 		<description>Dead Zone (Hack, English)</description>
 		<year>2019</year>
 		<manufacturer>Stardust Crusaders</manufacturer>
-		<rom name="Dead Zone (T-Eng).fds" size="131000" crc="1bf2409a"/>
+		<rom name="Dead Zone T-Eng (2019)(Stardust Crusaders).fds" size="131000" crc="1bf2409a"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -303,7 +313,7 @@
 		<description>Dead Zone (Japan)</description>
 		<year>1986</year>
 		<manufacturer>Sunsoft</manufacturer>
-		<rom name="Dead Zone (Japan).fds" size="131000" crc="de673254"/>
+		<rom name="Dead Zone (Japan)(1986)(Sunsoft).fds" size="131000" crc="de673254"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -312,7 +322,7 @@
 		<description>Dig Dug (Japan)</description>
 		<year>1990</year>
 		<manufacturer>Namco</manufacturer>
-		<rom name="Dig Dug (Japan).fds" size="65516" crc="eb126143"/>
+		<rom name="Dig Dug (Japan)(1990)(Namco).fds" size="65516" crc="eb126143"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -321,7 +331,7 @@
 		<description>Dig Dug II (Japan)</description>
 		<year>1990</year>
 		<manufacturer>Namco</manufacturer>
-		<rom name="Dig Dug II (Japan).fds" size="65516" crc="1b2b1342"/>
+		<rom name="Dig Dug II (Japan)(1990)(Namco).fds" size="65516" crc="1b2b1342"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -331,7 +341,7 @@
 		<description>Dirty Pair - Project Eden (Hack, English)</description>
 		<year>2021</year>
 		<manufacturer>Stardust Crusaders</manufacturer>
-		<rom name="Dirty Pair - Project Eden (T-Eng).fds" size="131000" crc="5707b40a"/>
+		<rom name="Dirty Pair - Project Eden T-Eng (2021)(stardust Crusaders).fds" size="131000" crc="5707b40a"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -340,7 +350,7 @@
 		<description>Dirty Pair - Project Eden (Japan)</description>
 		<year>1987</year>
 		<manufacturer>Bandai</manufacturer>
-		<rom name="Dirty Pair - Project Eden (Japan).fds" size="131016" crc="0bba3177"/>
+		<rom name="Dirty Pair - Project Eden (Japan)(1987)(Bandai).fds" size="131016" crc="0bba3177"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -349,7 +359,7 @@
 		<description>Doki Doki Panic (Japan)</description>
 		<year>1987</year>
 		<manufacturer>Nintendo - Fuji TV</manufacturer>
-		<rom name="Doki Doki Panic (Japan).fds" size="131016" crc="b36dfcd2"/>
+		<rom name="Doki Doki Panic (Japan)(1987)(Nintendo - Fuji TV).fds" size="131016" crc="b36dfcd2"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -358,7 +368,7 @@
 		<description>Donkey Kong (Japan)</description>
 		<year>1988</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Donkey Kong (Japan).fds" size="65516" crc="6c0740e9"/>
+		<rom name="Donkey Kong (Japan)(1988)(Nintendo).fds" size="65516" crc="6c0740e9"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -367,7 +377,7 @@
 		<description>Donkey Kong Jr. (Japan)</description>
 		<year>1988</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Donkey Kong Jr. (Japan).fds" size="65516" crc="3046966a"/>
+		<rom name="Donkey Kong Jr. (Japan)(1988)(Nintendo).fds" size="65516" crc="3046966a"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -533,7 +543,7 @@
 		<description>Famimaga Disk Vol. 1 - Hong Kong (Japan)</description>
 		<year>1990</year>
 		<manufacturer>Tokuma Shoten</manufacturer>
-		<rom name="Famimaga Disk Vol. 1 - Hong Kong (Japan).fds" size="65516" crc="c6f69987"/>
+		<rom name="Famimaga Disk Vol. 1 - Hong Kong (Japan)(1990)(Tokuma Shoten).fds" size="65516" crc="c6f69987"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -542,7 +552,7 @@
 		<description>Famimaga Disk Vol. 2 - Panic Space (Japan)</description>
 		<year>1990</year>
 		<manufacturer>Tokuma Shoten</manufacturer>
-		<rom name="Famimaga Disk Vol. 2 - Panic Space (Japan).fds" size="131016" crc="1274645d"/>
+		<rom name="Famimaga Disk Vol. 2 - Panic Space (Japan)(1990)(Tokuma Shoten).fds" size="131016" crc="1274645d"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -551,7 +561,7 @@
 		<description>Famimaga Disk Vol. 3 - All 1 (Japan)</description>
 		<year>1991</year>
 		<manufacturer>Tokuma Shoten</manufacturer>
-		<rom name="Famimaga Disk Vol. 3 - All 1 (Japan).fds" size="65516" crc="936c8017"/>
+		<rom name="Famimaga Disk Vol. 3 - All 1 (Japan)(1991)(Tokuma Shoten).fds" size="65516" crc="936c8017"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -560,7 +570,7 @@
 		<description>Famimaga Disk Vol. 4 - Clox (Japan)</description>
 		<year>1991</year>
 		<manufacturer>Tokuma Shoten</manufacturer>
-		<rom name="Famimaga Disk Vol. 4 - Clox (Japan).fds" size="65516" crc="e46ffd9b"/>
+		<rom name="Famimaga Disk Vol. 4 - Clox (Japan)(1991)(Tokuma Shoten).fds" size="65516" crc="e46ffd9b"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -569,7 +579,7 @@
 		<description>Famimaga Disk Vol. 5 - Puyo Puyo (Japan)</description>
 		<year>1991</year>
 		<manufacturer>Tokuma Shoten</manufacturer>
-		<rom name="Famimaga Disk Vol. 5 - Puyo Puyo (Japan).fds" size="131016" crc="e84c7927"/>
+		<rom name="Famimaga Disk Vol. 5 - Puyo Puyo (Japan)(1991)(Tokuma Shoten).fds" size="131016" crc="e84c7927"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -578,7 +588,7 @@
 		<description>Famimaga Disk Vol. 6 - Janken Disk Jou (Japan)</description>
 		<year>1992</year>
 		<manufacturer>Tokuma Shoten</manufacturer>
-		<rom name="Famimaga Disk Vol. 6 - Janken Disk Jou (Japan).fds" size="131016" crc="251ddeaa"/>
+		<rom name="Famimaga Disk Vol. 6 - Janken Disk Jou (Japan)(1992)(Tokuma Shoten).fds" size="131016" crc="251ddeaa"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -596,7 +606,7 @@
 		<description>Final Command - Akai Yousai (Japan)</description>
 		<year>1988</year>
 		<manufacturer>Konami</manufacturer>
-		<rom name="Final Command - Akai Yousai (Japan).fds" size="131016" crc="b89d5131"/>
+		<rom name="Final Command - Akai Yousai (Japan)(1988)(Konami).fds" size="131016" crc="b89d5131"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -605,7 +615,7 @@
 		<description>Fire Bam (Japan)</description>
 		<year>1988</year>
 		<manufacturer>HAL Laboratory</manufacturer>
-		<rom name="Fire Bam (Japan).fds" size="131016" crc="9e5c5ede"/>
+		<rom name="Fire Bam (Japan)(1988)(Hal Labs).fds" size="131016" crc="9e5c5ede"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -614,7 +624,7 @@
 		<description>Fire Rock (Japan)</description>
 		<year>1988</year>
 		<manufacturer>System Sacom</manufacturer>
-		<rom name="Fire Rock (Japan).fds" size="131016" crc="e44c7313"/>
+		<rom name="Fire Rock (Japan)(1988)(System Sacom).fds" size="131016" crc="e44c7313"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -675,6 +685,16 @@
 		<driver status="good"/>
 	</game>
 	<game name="gingaden" romof="fdsbios" sourcefile="nes/d_nes.cpp">
+		<comment>Hack</comment>
+		<description>Ginga Denshou - Galaxy Odyssey (Hack, English)</description>
+		<year>2015</year>
+		<manufacturer>Chris M. Covell</manufacturer>
+		<rom name="Ginga Denshou - Galaxy Odyssey T-Eng (2015)(Chris M. Covell).fds" size="131000" crc="f9534dda"/>
+		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
+	<game name="gingadenj" cloneof="gingaden" romof="gingaden" sourcefile="nes/d_nes.cpp">
 		<description>Ginga Denshou - Galaxy Odyssey (Japan)</description>
 		<year>1986</year>
 		<manufacturer>Imagineer</manufacturer>
@@ -858,16 +878,6 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
-	<game name="kalinnotsurugi" romof="fdsbios" sourcefile="nes/d_nes.cpp">
-		<comment>Hack</comment>
-		<description>Kalin no Tsurugi (Hack, English)</description>
-		<year>2005</year>
-		<manufacturer>filler, KingMike, satsu</manufacturer>
-		<rom name="Kalin no Tsurugi T-Eng (2005)(filler, KingMike, satsu).fds" size="131000" crc="7825c974"/>
-		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
-		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
-		<driver status="good"/>
-	</game>
 	<game name="kalinnotsurugij" cloneof="kalinnotsurugi" romof="kalinnotsurugi" sourcefile="nes/d_nes.cpp">
 		<description>Kalin no Tsurugi (Japan)</description>
 		<year>1987</year>
@@ -877,6 +887,16 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
+	<game name="kalinnotsurugi" romof="fdsbios" sourcefile="nes/d_nes.cpp">
+		<comment>Hack</comment>
+		<description>Kalin no Tsurugi ~ Sword of Kalin, The (Hack, English)</description>
+		<year>2005</year>
+		<manufacturer>filler, KingMike, satsu</manufacturer>
+		<rom name="Kalin no Tsurugi T-Eng (2005)(filler, KingMike, satsu).fds" size="131000" crc="7825c974"/>
+		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
 	<game name="kamenridblaen" romof="fdsbios" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
 		<description>Kamen Rider Black - Taiketsu Shadow Moon (Hack, English)</description>
@@ -1342,6 +1362,25 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
+	<game name="santaclausj" cloneof="santaclause" romof="santaclause" sourcefile="nes/d_nes.cpp">
+		<description>Santa Claus no Takarabako (Japan)</description>
+		<year>1987</year>
+		<manufacturer>Data East</manufacturer>
+		<rom name="Santa Claus no Takarabako (Japan)(1987)(Data East).fds" size="131000" crc="645b2ec7"/>
+		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
+	<game name="santaclause" romof="fdsbios" sourcefile="nes/d_nes.cpp">
+		<comment>Hack</comment>
+		<description>Santa Claus' Toybox (Hack, English v1.01)</description>
+		<year>2003</year>
+		<manufacturer>Gil Galad</manufacturer>
+		<rom name="Santa Claus' Toybox T-Eng v1.01 (2003)(Gil Galad).fds" size="131000" crc="d58bb23a"/>
+		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
 	<game name="sdgunworgacsescwac" cloneof="sdgunworgacsescwa" romof="sdgunworgacsescwa" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
 		<description>SD Gundam World - Gachapon Senshi - Scramble Wars (Hack, Spanish)</description>
@@ -1400,7 +1439,7 @@
 	</game>
 	<game name="silvi" romof="fdsbios" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
-		<description>Silviana - Ai Ippai no Little Angel (Hack, English)</description>
+		<description>Silviana (Hack, English)</description>
 		<year>2002</year>
 		<manufacturer>Mute</manufacturer>
 		<rom name="Silviana - Ai Ippai no Little Angel T-Eng (2002)(Mute).fds" size="131000" crc="c5b1bff7"/>
@@ -1435,6 +1474,15 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
+	<game name="suishoudrag" cloneof="crystaldrag" romof="crystaldrag" sourcefile="nes/d_nes.cpp">
+		<description>Suishou no Dragon (Japan)</description>
+		<year>1986</year>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Suishou no Dragon (Japan)(1986)(Squaresoft).fds" size="131000" crc="6b56808b"/>
+		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
 	<game name="superboyallan" romof="fdsbios" sourcefile="nes/d_nes.cpp">
 		<description>Super Boy Allan (Japan)</description>
 		<year>1987</year>
@@ -1447,8 +1495,8 @@
 	<game name="superlodrun" romof="fdsbios" sourcefile="nes/d_nes.cpp">
 		<description>Super Lode Runner (Japan)</description>
 		<year>1987</year>
-		<manufacturer>Irem</manufacturer>
-		<rom name="Super Lode Runner (Japan).fds" size="131000" crc="e66f4682"/>
+		<manufacturer>Irem Corp.</manufacturer>
+		<rom name="Super Lode Runner (Japan)(1987)(Irem).fds" size="131000" crc="e66f4682"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -1456,8 +1504,8 @@
 	<game name="superlodrunii" romof="fdsbios" sourcefile="nes/d_nes.cpp">
 		<description>Super Lode Runner II (Japan)</description>
 		<year>1987</year>
-		<manufacturer>Irem</manufacturer>
-		<rom name="Super Lode Runner II (Japan).fds" size="131000" crc="758888f4"/>
+		<manufacturer>Irem Corp.</manufacturer>
+		<rom name="Super Lode Runner II (Japan)(1987)(Irem).fds" size="131000" crc="758888f4"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -1476,7 +1524,7 @@
 		<description>Super Mario Brothers (Japan)</description>
 		<year>1986</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Super Mario Brothers (Japan).fds" size="65500" crc="e0890cf2"/>
+		<rom name="Super Mario Brothers (Japan)(1986)(Nintendo).fds" size="65500" crc="e0890cf2"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -1491,20 +1539,20 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
-	<game name="supermarbro2e" cloneof="supermarbro2" romof="supermarbro2" sourcefile="nes/d_nes.cpp">
-		<description>Super Mario Brothers 2 (Japan) (DV 2)</description>
-		<year>1986</year>
-		<manufacturer>Nintendo</manufacturer>
-		<rom name="Super Mario Bros 2 (J)(En)(DV 2)(1986)(Nintendo).fds" size="65500" crc="5c419ee8"/>
-		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
-		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
-		<driver status="good"/>
-	</game>
 	<game name="supermarbro2" romof="fdsbios" sourcefile="nes/d_nes.cpp">
 		<description>Super Mario Brothers 2 (Japan)</description>
 		<year>1986</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Super Mario Brothers 2 (Japan).fds" size="131016" crc="443ed7b3"/>
+		<rom name="Super Mario Brothers 2 (Japan)(1986)(Nintendo).fds" size="131016" crc="443ed7b3"/>
+		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
+	<game name="supermarbro2e" cloneof="supermarbro2" romof="supermarbro2" sourcefile="nes/d_nes.cpp">
+		<description>Super Mario Brothers 2 (Japan, DV 2)</description>
+		<year>1986</year>
+		<manufacturer>Nintendo</manufacturer>
+		<rom name="Super Mario Bros 2 (J)(En)(DV 2)(1986)(Nintendo).fds" size="65500" crc="5c419ee8"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
@@ -1530,8 +1578,8 @@
 	<game name="tobiddai" romof="fdsbios" sourcefile="nes/d_nes.cpp">
 		<description>Tobidase Daisakusen (Japan)</description>
 		<year>1987</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="Tobidase Daisakusen (Japan)(1987)(Square).fds" size="131016" crc="95546107"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Tobidase Daisakusen (Japan)(1987)(Squaresoft).fds" size="131016" crc="95546107"/>
 		<rom name="fdsbios.nes" merge="fdsbios.nes" size="8192" crc="5e607dcf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, NES Games only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, NES Games only).dat
index 958e662e1..b176034de 100644
--- a/dats/FinalBurn Neo (ClrMame Pro XML, NES Games only).dat	
+++ b/dats/FinalBurn Neo (ClrMame Pro XML, NES Games only).dat	
@@ -745,7 +745,7 @@
 		<description>Akumajou Dracula (Hack, Chinese)</description>
 		<year>199?</year>
 		<manufacturer>Fo Yi Team</manufacturer>
-		<rom name="Akumajou Dracula (T-Chi).nes" size="131088" crc="dc749e67"/>
+		<rom name="Akumajou Dracula (T-Chi)(199x)(Fo Yi Team).nes" size="131088" crc="dc749e67"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2402,7 +2402,7 @@
 		<description>Bomberman (USA)</description>
 		<year>1989</year>
 		<manufacturer>Hudson Soft</manufacturer>
-		<rom name="Bomberman (USA).nes" size="24592" crc="b9804046"/>
+		<rom name="Bomberman (USA)(1989)(Hudson Soft).nes" size="24592" crc="b9804046"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2419,7 +2419,7 @@
 		<description>Bomberman II (USA)</description>
 		<year>1993</year>
 		<manufacturer>Hudson Soft</manufacturer>
-		<rom name="Bomberman II (USA).nes" size="131088" crc="cc7bcfeb"/>
+		<rom name="Bomberman II (USA)(1993)(Hudson Soft).nes" size="131088" crc="cc7bcfeb"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2427,7 +2427,7 @@
 		<description>Bonk's Adventure (USA)</description>
 		<year>1994</year>
 		<manufacturer>Hudson Soft</manufacturer>
-		<rom name="Bonk's Adventure (USA).nes" size="393232" crc="6b53d59a"/>
+		<rom name="Bonk's Adventure (USA)(1994)(Hudson Soft).nes" size="393232" crc="6b53d59a"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2435,7 +2435,7 @@
 		<description>Booby Kids (Japan)</description>
 		<year>1987</year>
 		<manufacturer>Nichibutsu</manufacturer>
-		<rom name="Booby Kids (Japan).nes" size="131088" crc="828f23a8"/>
+		<rom name="Booby Kids (Japan)(1987)(Nichibutsu).nes" size="131088" crc="828f23a8"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2468,7 +2468,7 @@
 		<description>Boulder Dash (USA)</description>
 		<year>1990</year>
 		<manufacturer>JVC</manufacturer>
-		<rom name="Boulder Dash (USA).nes" size="65552" crc="008f1536"/>
+		<rom name="Boulder Dash (USA)(1990)(JVC).nes" size="65552" crc="008f1536"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2512,7 +2512,7 @@
 		<description>Bram Stoker's Dracula (USA)</description>
 		<year>1993</year>
 		<manufacturer>Sony Imagesoft</manufacturer>
-		<rom name="Bram Stoker's Dracula (USA).nes" size="262160" crc="f5321963"/>
+		<rom name="Bram Stoker's Dracula (USA)(1993)(Sony Imagesoft).nes" size="262160" crc="f5321963"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2520,7 +2520,7 @@
 		<description>BreakThru (USA)</description>
 		<year>1987</year>
 		<manufacturer>Data East</manufacturer>
-		<rom name="BreakThru (USA).nes" size="262160" crc="c85bf3e3"/>
+		<rom name="BreakThru (USA)(1987)(Data East).nes" size="262160" crc="c85bf3e3"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2528,7 +2528,7 @@
 		<description>Bubble Bath Babes (USA) (Unl)</description>
 		<year>1991</year>
 		<manufacturer>Panesian</manufacturer>
-		<rom name="Bubble Bath Babes (USA) (Unl).nes" size="98320" crc="f36edcc5"/>
+		<rom name="Bubble Bath Babes (USA)(Unl)(1991)(Panesian).nes" size="98320" crc="f36edcc5"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2570,7 +2570,7 @@
 		<description>Bucky O'Hare (USA)</description>
 		<year>1992</year>
 		<manufacturer>Konami</manufacturer>
-		<rom name="Bucky O'Hare (USA).nes" size="262160" crc="3c9622d3"/>
+		<rom name="Bucky O'Hare (USA)(1992)(Konami).nes" size="262160" crc="3c9622d3"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2578,7 +2578,7 @@
 		<description>Buggy Popper (Japan)</description>
 		<year>1986</year>
 		<manufacturer>Data East</manufacturer>
-		<rom name="Buggy Popper (Japan).nes" size="65552" crc="46cc2d53"/>
+		<rom name="Buggy Popper (Japan)(1986)(Data East).nes" size="65552" crc="46cc2d53"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2586,7 +2586,7 @@
 		<description>Bugs Bunny Birthday Blowout, The (USA)</description>
 		<year>1990</year>
 		<manufacturer>Kemco</manufacturer>
-		<rom name="Bugs Bunny Birthday Blowout, The (USA).nes" size="262160" crc="38fdb7f4"/>
+		<rom name="Bugs Bunny Birthday Blowout, The (USA)(1990)(Kemco).nes" size="262160" crc="38fdb7f4"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2594,7 +2594,7 @@
 		<description>Bugs Bunny Crazy Castle, The (USA)</description>
 		<year>1989</year>
 		<manufacturer>Kemco</manufacturer>
-		<rom name="Bugs Bunny Crazy Castle, The (USA).nes" size="98320" crc="db0c3656"/>
+		<rom name="Bugs Bunny Crazy Castle, The (USA)(1989)(Kemco).nes" size="98320" crc="db0c3656"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2602,7 +2602,7 @@
 		<description>Bump'n'Jump (USA)</description>
 		<year>1988</year>
 		<manufacturer>Vic Tokai</manufacturer>
-		<rom name="Bump'n'Jump (USA).nes" size="65552" crc="79bfe095"/>
+		<rom name="Bump'n'Jump (USA)(1988)(Vic Tokai).nes" size="65552" crc="79bfe095"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2610,7 +2610,7 @@
 		<description>Burai Fighter (Japan)</description>
 		<year>1990</year>
 		<manufacturer>Taito Corp.</manufacturer>
-		<rom name="Burai Fighter (Japan)(1990)(Taito Corp.).nes" size="65552" crc="76af01af"/>
+		<rom name="Burai Fighter (Japan)(1990)(Taito).nes" size="65552" crc="76af01af"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2618,7 +2618,7 @@
 		<description>Burai Fighter (USA)</description>
 		<year>1990</year>
 		<manufacturer>Taxan</manufacturer>
-		<rom name="Burai Fighter (USA).nes" size="65552" crc="519ae8f2"/>
+		<rom name="Burai Fighter (USA)(1990)(Taxan).nes" size="65552" crc="519ae8f2"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2626,7 +2626,7 @@
 		<description>BurgerTime (USA)</description>
 		<year>1987</year>
 		<manufacturer>Data East</manufacturer>
-		<rom name="BurgerTime (USA).nes" size="24592" crc="516549f9"/>
+		<rom name="BurgerTime (USA)(1987)(Data East).nes" size="24592" crc="516549f9"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2917,7 +2917,7 @@
 		<description>Castlevania - Chorus of Mysteries (Hack, v1.1)</description>
 		<year>2007</year>
 		<manufacturer>Optomon &amp; Dr. Mario</manufacturer>
-		<rom name="Castlevania - Chorus of Mysteries (v1.1, Hack).nes" size="131088" crc="bad05634"/>
+		<rom name="Castlevania - Chorus of Mysteries v1.1 (2007)(Optomon, Dr. Mario).nes" size="131088" crc="bad05634"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -2926,7 +2926,7 @@
 		<description>Castlevania - The Holy Relics (Hack)</description>
 		<year>2017</year>
 		<manufacturer>Optomon</manufacturer>
-		<rom name="Castlevania - The Holy Relics (Hack).nes" size="131088" crc="8603cbbb"/>
+		<rom name="Castlevania - The Holy Relics (2017)(Optomon).nes" size="131088" crc="8603cbbb"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6434,24 +6434,24 @@
 		<description>Final Fantasy (USA)</description>
 		<year>1990</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Final Fantasy (USA).nes" size="262160" crc="5c892f3b"/>
+		<rom name="Final Fantasy (USA)(1990)(Nintendo).nes" size="262160" crc="5c892f3b"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
 	<game name="finalfan12" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
 		<description>Final Fantasy 1 &amp; 2 (Hack, English)</description>
-		<year>2016</year>
+		<year>2001</year>
 		<manufacturer>Demiforce</manufacturer>
-		<rom name="Final Fantasy 1 &amp; 2 (T-eng).nes" size="524304" crc="6f5f3bd2"/>
+		<rom name="Final Fantasy 1 &amp; 2 T-Eng (2001)(Demiforce).nes" size="524304" crc="6f5f3bd2"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
 	<game name="finalfan12j" cloneof="finalfan12" romof="finalfan12" sourcefile="nes/d_nes.cpp">
 		<description>Final Fantasy 1 &amp; 2 (Japan)</description>
 		<year>1994</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="Final Fantasy 1 &amp; 2 (Japan).nes" size="524304" crc="6f8906ad"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Final Fantasy 1 &amp; 2 (Japan)(1994)(Squaresoft).nes" size="524304" crc="6f8906ad"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6468,8 +6468,8 @@
 		<comment>Prototype</comment>
 		<description>Final Fantasy II (USA, Prototype)</description>
 		<year>1991</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="Final Fantasy II (USA, Proto)(1991)(Square).nes" size="262160" crc="f60d282c"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Final Fantasy II (USA, Proto)(1991)(Squaresoft).nes" size="262160" crc="f60d282c"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6485,8 +6485,8 @@
 	<game name="finalfaniii" sourcefile="nes/d_nes.cpp">
 		<description>Final Fantasy III (Japan)</description>
 		<year>1990</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="Final Fantasy III (Japan).nes" size="524304" crc="99f5db31"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Final Fantasy III (Japan)(1990)(Squaresoft).nes" size="524304" crc="99f5db31"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6494,16 +6494,16 @@
 		<description>Final Fantasy VII (China) (Unl)</description>
 		<year>2005</year>
 		<manufacturer>ShenZhen Nanjing Technology</manufacturer>
-		<rom name="Final Fantasy VII (China).nes" size="2097168" crc="e5bf8f0c"/>
+		<rom name="Final Fantasy VII (China)(Unl)(2005)(SNT).nes" size="2097168" crc="e5bf8f0c"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
 	<game name="finalfanviiadvch" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
 		<description>Final Fantasy VII - Advent Children (Hack, English)</description>
-		<year>2015</year>
+		<year>2013</year>
 		<manufacturer>Lindblum</manufacturer>
-		<rom name="Final Fantasy VII - Advent Children (T-Eng).nes" size="2097168" crc="8de6d62f"/>
+		<rom name="Final Fantasy VII - Advent Children T-Eng (2013)(Limdblum).nes" size="2097168" crc="8de6d62f"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6511,7 +6511,7 @@
 		<description>Final Fight 3 (Unl)</description>
 		<year>1998</year>
 		<manufacturer>J.Y. Company</manufacturer>
-		<rom name="Final Fight 3 (Unl).nes" size="786448" crc="97f05116"/>
+		<rom name="Final Fight 3 (China)(Unl)(1998)(J.Y. Company).nes" size="786448" crc="97f05116"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6519,7 +6519,7 @@
 		<description>Final Lap (Japan)</description>
 		<year>1988</year>
 		<manufacturer>Namco</manufacturer>
-		<rom name="Final Lap (Japan).nes" size="262160" crc="a65568a9"/>
+		<rom name="Final Lap (Japan)(1998)(Namco).nes" size="262160" crc="a65568a9"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6534,9 +6534,9 @@
 	</game>
 	<game name="finalmission" cloneof="scat" romof="scat" sourcefile="nes/d_nes.cpp">
 		<description>Final Mission (Hack, English)</description>
-		<year>1990</year>
-		<manufacturer>Natsume</manufacturer>
-		<rom name="Final Mission (T-Eng).nes" size="393232" crc="01c4633e"/>
+		<year>2014</year>
+		<manufacturer>Stardust Crusaders</manufacturer>
+		<rom name="Final Mission T-Eng (2014)(Stardust Crusaders).nes" size="393232" crc="01c4633e"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6544,7 +6544,7 @@
 		<description>Final Mission (Japan)</description>
 		<year>1990</year>
 		<manufacturer>Natsume</manufacturer>
-		<rom name="Final Mission (Japan).nes" size="262160" crc="b8273b87"/>
+		<rom name="Final Mission (Japan)(1990)(Natsume).nes" size="262160" crc="b8273b87"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -6552,7 +6552,7 @@
 		<description>Fire 'n Ice (USA)</description>
 		<year>1993</year>
 		<manufacturer>Tecmo</manufacturer>
-		<rom name="Fire 'n Ice (USA).nes" size="262160" crc="083c02c1"/>
+		<rom name="Fire 'n Ice (USA)(1993)(Tecmo).nes" size="262160" crc="083c02c1"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -8311,20 +8311,20 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
-	<game name="heisetenbak" sourcefile="nes/d_nes.cpp">
-		<comment>Hack</comment>
-		<description>Heisei Tensai Bakabon (Hack, English)</description>
-		<year>2007</year>
-		<manufacturer>KingMike</manufacturer>
-		<rom name="Heisei Tensai Bakabon (T-Eng).nes" size="393232" crc="c41628ef"/>
-		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
-		<driver status="good"/>
-	</game>
 	<game name="heisetenbakj" cloneof="heisetenbak" romof="heisetenbak" sourcefile="nes/d_nes.cpp">
 		<description>Heisei Tensai Bakabon (Japan)</description>
 		<year>1991</year>
 		<manufacturer>Namco</manufacturer>
-		<rom name="Heisei Tensai Bakabon (Japan).nes" size="262160" crc="141937d0"/>
+		<rom name="Heisei Tensai Bakabon (Japan)(1991)(Namco).nes" size="262160" crc="141937d0"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
+	<game name="heisetenbak" sourcefile="nes/d_nes.cpp">
+		<comment>Hack</comment>
+		<description>Heisei Tensai Bakabon ~ Genius Bakabon, The (Hack, English)</description>
+		<year>2007</year>
+		<manufacturer>KingMike's Translations</manufacturer>
+		<rom name="Heisei Tensai Bakabon T-Eng (2007)(KingMike's Translations).nes" size="393232" crc="c41628ef"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -8425,15 +8425,15 @@
 		<description>High Speed (USA)</description>
 		<year>1991</year>
 		<manufacturer>Tradewest</manufacturer>
-		<rom name="High Speed (USA).nes" size="196624" crc="8ca37960"/>
+		<rom name="High Speed (USA)(1991)(Tradewest).nes" size="196624" crc="8ca37960"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
 	<game name="highwaystar" cloneof="radracer" romof="radracer" sourcefile="nes/d_nes.cpp">
 		<description>Highway Star (Japan)</description>
 		<year>1987</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="Highway Star (Japan).nes" size="131088" crc="d0980131"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Highway Star (Japan)(1987)(Squaresoft).nes" size="131088" crc="d0980131"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -8450,7 +8450,7 @@
 		<description>Hikari no Senshi Photon - The Ultimate Game on Planet Earth (Japan)</description>
 		<year>1987</year>
 		<manufacturer>Takara</manufacturer>
-		<rom name="Hikari no Senshi Photon - The Ultimate Game on Planet Earth (Japan).nes" size="131088" crc="924ae9e4"/>
+		<rom name="Hikari no Senshi Photon - The Ultimate Game on Planet Earth (Japan)(1987)(Takara).nes" size="131088" crc="924ae9e4"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9197,7 +9197,7 @@
 		<description>Jaws (USA)</description>
 		<year>1987</year>
 		<manufacturer>Ljn</manufacturer>
-		<rom name="Jaws (USA).nes" size="65552" crc="fece3f05"/>
+		<rom name="Jaws (USA)(1987)(Ljn).nes" size="65552" crc="fece3f05"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9228,20 +9228,20 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
-	<game name="jesus" sourcefile="nes/d_nes.cpp">
-		<comment>Hack</comment>
-		<description>Jesus - Kyoufu no Bio Monster (Hack, English)</description>
-		<year>2016</year>
-		<manufacturer>Stardust Crusaders</manufacturer>
-		<rom name="Jesus - Kyoufu no Bio Monster (T-eng).nes" size="262160" crc="308c72f5"/>
-		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
-		<driver status="good"/>
-	</game>
 	<game name="jesusj" cloneof="jesus" romof="jesus" sourcefile="nes/d_nes.cpp">
 		<description>Jesus - Kyoufu no Bio Monster (Japan)</description>
 		<year>1989</year>
 		<manufacturer>King Records</manufacturer>
-		<rom name="Jesus - Kyoufu no Bio Monster (Japan).nes" size="262160" crc="5c2c76a4"/>
+		<rom name="Jesus - Kyoufu no Bio Monster (Japan)(1989)(King Records).nes" size="262160" crc="5c2c76a4"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
+	<game name="jesus" sourcefile="nes/d_nes.cpp">
+		<comment>Hack</comment>
+		<description>Jesus: Tale of the Dreadful Bio-Monster (Hack, English)</description>
+		<year>2016</year>
+		<manufacturer>Stardust Crusaders</manufacturer>
+		<rom name="Jesus - Kyoufu no Bio Monster T-Eng (2016)(Stardust Crusaders).nes" size="262160" crc="308c72f5"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9258,7 +9258,7 @@
 		<description>Jetsons, The - Cogswell's Caper! (Japan)</description>
 		<year>1993</year>
 		<manufacturer>Taito Corp.</manufacturer>
-		<rom name="Jetsons, The - Cogswell's Caper! (Japan)(1993)(Taito Corp.).nes" size="393232" crc="4733c232"/>
+		<rom name="Jetsons, The - Cogswell's Caper! (Japan)(1993)(Taito).nes" size="393232" crc="4733c232"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9283,7 +9283,7 @@
 		<description>Jigoku Gokuraku Maru (Japan)</description>
 		<year>1990</year>
 		<manufacturer>Pack-In-Video</manufacturer>
-		<rom name="Jigoku Gokuraku Maru (Japan).nes" size="262160" crc="d9564797"/>
+		<rom name="Jigoku Gokuraku Maru (Japan)(1990)(Pack-In-Video).nes" size="262160" crc="d9564797"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9291,7 +9291,7 @@
 		<description>Jikuu Yuuden - Debias (Japan)</description>
 		<year>1987</year>
 		<manufacturer>Namco</manufacturer>
-		<rom name="Jikuu Yuuden - Debias (Japan).nes" size="196624" crc="0f40cdc2"/>
+		<rom name="Jikuu Yuuden - Debias (Japan)(1987)(Namco).nes" size="196624" crc="0f40cdc2"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9335,7 +9335,7 @@
 		<description>Jimmy Connors Tennis (USA)</description>
 		<year>1993</year>
 		<manufacturer>UBI Soft</manufacturer>
-		<rom name="Jimmy Connors Tennis (USA).nes" size="131088" crc="c31e3754"/>
+		<rom name="Jimmy Connors Tennis (USA)(1993)(UBI Soft).nes" size="131088" crc="c31e3754"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9351,8 +9351,8 @@
 	<game name="jj" sourcefile="nes/d_nes.cpp">
 		<description>JJ (Japan)</description>
 		<year>1987</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="JJ (Japan).nes" size="131088" crc="8093ec6f"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="JJ (Japan)(1987)(Squaresoft).nes" size="131088" crc="8093ec6f"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9360,7 +9360,7 @@
 		<description>Joe &amp; Mac (USA)</description>
 		<year>1992</year>
 		<manufacturer>Data East</manufacturer>
-		<rom name="Joe &amp; Mac (USA).nes" size="262160" crc="0c4000be"/>
+		<rom name="Joe &amp; Mac (USA)(1992)(Data East).nes" size="262160" crc="0c4000be"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9368,7 +9368,7 @@
 		<description>John Elway's Quarterback (USA)</description>
 		<year>1989</year>
 		<manufacturer>Tradewest</manufacturer>
-		<rom name="John Elway's Quarterback (USA).nes" size="65552" crc="801931af"/>
+		<rom name="John Elway's Quarterback (USA)(1989)(Tradewest).nes" size="65552" crc="801931af"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -9487,15 +9487,6 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
-	<game name="junglebooktheb" cloneof="junglebookthe" romof="junglebookthe" sourcefile="nes/d_nes.cpp">
-		<comment>Hack</comment>
-		<description>Jungle Book, The (Brightness fix)</description>
-		<year>2020</year>
-		<manufacturer>Ilya Indigo</manufacturer>
-		<rom name="jungle book, the (2020)(brightness fix).nes" size="262160" crc="1c9a2869"/>
-		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
-		<driver status="good"/>
-	</game>
 	<game name="junglebookthec" cloneof="junglebookthe" romof="junglebookthe" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
 		<description>Jungle Book, The (Hack, Spanish)</description>
@@ -9513,6 +9504,15 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
+	<game name="junglebooktheb" cloneof="junglebookthe" romof="junglebookthe" sourcefile="nes/d_nes.cpp">
+		<comment>Hack</comment>
+		<description>Jungle Book, The - Brightness Fix (Hack)</description>
+		<year>2020</year>
+		<manufacturer>Ilya Indigo</manufacturer>
+		<rom name="Jungle Book, The (Brightness Fix)(2020)(Ilya Indigo).nes" size="262160" crc="1c9a2869"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
 	<game name="junkoid" cloneof="metroid" romof="metroid" sourcefile="nes/d_nes.cpp">
 		<comment>Hack, Homebrew</comment>
 		<description>Junkoid (GlobalHack, v1.1)</description>
@@ -9645,7 +9645,7 @@
 		<description>Kage (Hack, Chinese)</description>
 		<year>2021</year>
 		<manufacturer>Ni You De Wu Cai Yu</manufacturer>
-		<rom name="Kage (T-Chi).nes" size="270352" crc="2ff63b35"/>
+		<rom name="Kage T-Chi (2021)(Ni You De Wu Cai Yu).nes" size="270352" crc="2ff63b35"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -10039,18 +10039,26 @@
 		<driver status="good"/>
 	</game>
 	<game name="kingkin" sourcefile="nes/d_nes.cpp">
-		<description>King of Kings, The (USA) (v5.0) (Unl)</description>
+		<description>King of Kings, The (USA, v5.0) (Unl)</description>
 		<year>1991</year>
 		<manufacturer>Wisdom Tree</manufacturer>
 		<rom name="King of Kings, The v5.0 (USA)(Unl)(1991)(Wisdom Tree).nes" size="262160" crc="6ac36bd7"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
+	<game name="kingsknightj" cloneof="kingsknight" romof="kingsknight" sourcefile="nes/d_nes.cpp">
+		<description>King's Knight (Japan)</description>
+		<year>1986</year>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="King's Knight (Japan)(1986)(Squaresoft).nes" size="65552" crc="5bdb2c21"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
 	<game name="kingsknight" sourcefile="nes/d_nes.cpp">
 		<description>King's Knight (USA)</description>
-		<year>1986</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="King's Knight (USA)(1986)(Square).nes" size="65552" crc="d8abbfd8"/>
+		<year>1989</year>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="King's Knight (USA)(1989)(Squaresoft).nes" size="65552" crc="d8abbfd8"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -12011,14 +12019,6 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
-	<game name="metalstormrr" cloneof="metalstorm" romof="metalstorm" sourcefile="nes/d_nes.cpp">
-		<description>Metal Storm (Re-Release)</description>
-		<year>2019</year>
-		<manufacturer>Irem - Retro-bit</manufacturer>
-		<rom name="Metal Storm (2019).nes" size="524304" crc="33af86d9"/>
-		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
-		<driver status="good"/>
-	</game>
 	<game name="metalstorm" sourcefile="nes/d_nes.cpp">
 		<description>Metal Storm (USA)</description>
 		<year>1991</year>
@@ -12027,6 +12027,14 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
+	<game name="metalstormrr" cloneof="metalstorm" romof="metalstorm" sourcefile="nes/d_nes.cpp">
+		<description>Metal Storm - Re-Release (Mapper 268)</description>
+		<year>2019</year>
+		<manufacturer>Irem Corp. - Retro-bit</manufacturer>
+		<rom name="Metal Storm - Mapper 268 (2019)(Retro-bit).nes" size="524304" crc="33af86d9"/>
+		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
+		<driver status="good"/>
+	</game>
 	<game name="metrocross" sourcefile="nes/d_nes.cpp">
 		<description>Metro-Cross (Japan)</description>
 		<year>1986</year>
@@ -14848,7 +14856,7 @@
 		<description>Racket Attack (USA)</description>
 		<year>1988</year>
 		<manufacturer>Jaleco</manufacturer>
-		<rom name="Racket Attack (USA).nes" size="393232" crc="c359cdb9"/>
+		<rom name="Racket Attack (USA)(1988)(Jaleco).nes" size="393232" crc="c359cdb9"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -14856,7 +14864,7 @@
 		<description>Rackets &amp; Rivals (Euro)</description>
 		<year>1989</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Rackets &amp; Rivals (Europe).nes" size="262160" crc="a535e1be"/>
+		<rom name="Rackets &amp; Rivals (Euro)(1989)(Nintendo).nes" size="262160" crc="a535e1be"/>
 		<video type="raster" orientation="horizontal" width="256" height="232" aspectx="256" aspecty="232"/>
 		<driver status="good"/>
 	</game>
@@ -14865,7 +14873,7 @@
 		<description>Rad Racer (Hack, Chinese)</description>
 		<year>2010</year>
 		<manufacturer>Jiu Ban</manufacturer>
-		<rom name="Rad Racer (T-Chi).nes" size="131088" crc="13cfd9ca"/>
+		<rom name="Rad Racer T-Chi (2010)(Jiu Ban).nes" size="131088" crc="13cfd9ca"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -14873,7 +14881,7 @@
 		<description>Rad Racer (USA)</description>
 		<year>1988</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Rad Racer (USA).nes" size="131088" crc="595daa35"/>
+		<rom name="Rad Racer (USA)(1988)(Nintendo).nes" size="131088" crc="595daa35"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -14882,15 +14890,15 @@
 		<description>Rad Racer II (Hack, Chinese)</description>
 		<year>2010</year>
 		<manufacturer>Jiu Ban</manufacturer>
-		<rom name="Rad Racer II (T-Chi).nes" size="131088" crc="1d7e1802"/>
+		<rom name="Rad Racer II T-Chi (2010)(Jiu Ban).nes" size="131088" crc="1d7e1802"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
 	<game name="radracerii" sourcefile="nes/d_nes.cpp">
 		<description>Rad Racer II (USA)</description>
 		<year>1990</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="Rad Racer II (USA).nes" size="131088" crc="39d371ec"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Rad Racer II (USA)(1990)(Squaresoft).nes" size="131088" crc="39d371ec"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -14898,7 +14906,7 @@
 		<description>Rad Racket - Deluxe Tennis II (USA)</description>
 		<year>1991</year>
 		<manufacturer>American Video Entertainment</manufacturer>
-		<rom name="Rad Racket - Deluxe Tennis II (USA).nes" size="65552" crc="db37c5b2"/>
+		<rom name="Rad Racket - Deluxe Tennis II (USA)(1991)(AVE).nes" size="65552" crc="db37c5b2"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -14907,7 +14915,7 @@
 		<description>Radia Senki - Reimei Hen (Hack, English)</description>
 		<year>1999</year>
 		<manufacturer>Dreamless, Jair, [cx]</manufacturer>
-		<rom name="Radia Senki - Reimei Hen (T-eng).nes" size="393232" crc="1d76af30"/>
+		<rom name="Radia Senki - Reimei Hen T-Eng (1999)(Dreamless, Jair, -cx-).nes" size="393232" crc="1d76af30"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -14915,7 +14923,7 @@
 		<description>Radia Senki - Reimei Hen (Japan)</description>
 		<year>1991</year>
 		<manufacturer>Tecmo</manufacturer>
-		<rom name="Radia Senki - Reimei Hen (Japan).nes" size="393232" crc="3bca1cd7"/>
+		<rom name="Radia Senki - Reimei Hen (Japan)(1991)(Tecmo).nes" size="393232" crc="3bca1cd7"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -14931,7 +14939,7 @@
 		<description>Raid 2020 (USA) (Unl)</description>
 		<year>1989</year>
 		<manufacturer>Color Dreams</manufacturer>
-		<rom name="Raid 2020 (USA) (Unl).nes" size="98320" crc="f69a2c11"/>
+		<rom name="Raid 2020 (USA)(Unl)(1989)(Color Dreams).nes" size="98320" crc="f69a2c11"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -15248,7 +15256,7 @@
 		<description>Road Fighter (Hack, Chinese v1.2)</description>
 		<year>2009</year>
 		<manufacturer>Jiu Ban</manufacturer>
-		<rom name="Road Fighter (T-Chi, v1.2).nes" size="24592" crc="b5d69e4c"/>
+		<rom name="Road Fighter T-Chi, v1.2 (2009)(Jiu Ban).nes" size="24592" crc="b5d69e4c"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -15322,7 +15330,7 @@
 		<description>RoboCop (Hack, Chinese)</description>
 		<year>2023</year>
 		<manufacturer>LSP Team</manufacturer>
-		<rom name="RoboCop (T-Chi).nes" size="393232" crc="a568590b"/>
+		<rom name="RoboCop T-Chi (2023)(LSP Team).nes" size="393232" crc="a568590b"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -15480,7 +15488,7 @@
 		<description>Rockman 3 - Dr. Wily no Saigo! (Hack, Chinese)</description>
 		<year>2023</year>
 		<manufacturer>NOKOH</manufacturer>
-		<rom name="Rockman 3 - Dr. Wily no Saigo! (T-Chi).nes" size="786448" crc="8125b0a4"/>
+		<rom name="Rockman 3 - Dr. Wily no Saigo! T-Chi (2023)(NOKOH).nes" size="786448" crc="8125b0a4"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -15688,7 +15696,7 @@
 		<description>Saint Saiya - Tian Ma Huan Xiang (China)</description>
 		<year>200?</year>
 		<manufacturer>&lt;unknown&gt;</manufacturer>
-		<rom name="Saint Saiya - Tian Ma Huan Xiang (China).nes" size="2097168" crc="31f810f2"/>
+		<rom name="Saint Saiya - Tian Ma Huan Xiang (China)(200x).nes" size="2097168" crc="31f810f2"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17702,10 +17710,10 @@
 		<driver status="good"/>
 	</game>
 	<game name="smb2" sourcefile="nes/d_nes.cpp">
-		<description>Super Mario Bros. 2 (USA) (Rev A)</description>
+		<description>Super Mario Bros. 2 (USA, Rev A)</description>
 		<year>1988</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Super Mario Bros. 2 (USA) (Rev A).nes" size="262160" crc="e0ca425c"/>
+		<rom name="Super Mario Bros. 2 (USA, Rev A)(1988)(Nintendo).nes" size="262160" crc="e0ca425c"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17718,9 +17726,9 @@
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
-	<game name="smb2j" sourcefile="nes/d_nes.cpp">
+	<game name="smb2j" cloneof="smb2" romof="smb2" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
-		<description>Super Mario Bros. 2 J (Japan, MMC3 Conversion)</description>
+		<description>Super Mario Bros. 2 J (Japan, MMC3 Conversion Hack)</description>
 		<year>2020</year>
 		<manufacturer>Loopy</manufacturer>
 		<rom name="Super Mario Bros. 2 J (Japan, MMC3 Conversion).nes" size="81936" crc="0133ebf9"/>
@@ -17732,24 +17740,24 @@
 		<description>Super Mario Bros. 3 (Hack, Chinese)</description>
 		<year>2016</year>
 		<manufacturer>NOKOH</manufacturer>
-		<rom name="Super Mario Bros. 3 (T-Chi).nes" size="458768" crc="e39b725d"/>
+		<rom name="Super Mario Bros. 3 T-Chi (2016)(NOKOH).nes" size="458768" crc="e39b725d"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
 	<game name="smb3cast" cloneof="smb3" romof="smb3" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
-		<description>Super Mario Bros. 3 (Hack, Spanish)</description>
-		<year>2018</year>
+		<description>Super Mario Bros. 3 (Hack, Spanish v2.2)</description>
+		<year>2023</year>
 		<manufacturer>Wave</manufacturer>
-		<rom name="super mario bros. 3 (usa) (rev 1) - castellano v1.0.nes" size="393232" crc="2e094f49"/>
+		<rom name="Super Mario Bros. 3 T-Spa v2.2 (2023)(Wave).nes" size="393232" crc="32c31c73"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
 	<game name="smb3" sourcefile="nes/d_nes.cpp">
-		<description>Super Mario Bros. 3 (USA) (Rev A)</description>
-		<year>1990</year>
+		<description>Super Mario Bros. 3 (USA, Rev A)</description>
+		<year>1988-1990</year>
 		<manufacturer>Nintendo</manufacturer>
-		<rom name="Super Mario Bros. 3 (USA) (Rev A).nes" size="393232" crc="0b742b33"/>
+		<rom name="Super Mario Bros. 3 (USA, Rev A)(1990)(Nintendo).nes" size="393232" crc="0b742b33"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17758,7 +17766,7 @@
 		<description>Super Mario Bros. 3 Definitive Edition (Hack)</description>
 		<year>2020</year>
 		<manufacturer>ActionGamer</manufacturer>
-		<rom name="Super Mario Bros. 3 Definitive Edition (Hack).nes" size="524304" crc="2a59f8c5"/>
+		<rom name="Super Mario Bros. 3 Definitive Edition (Hack)(2020)(ActionGamer).nes" size="524304" crc="2a59f8c5"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17767,7 +17775,7 @@
 		<description>Super Mario Bros. 3Mix (Hack)</description>
 		<year>2014</year>
 		<manufacturer>Southbird</manufacturer>
-		<rom name="Super Mario Bros. 3Mix (Hack).nes" size="786448" crc="16b3fe50"/>
+		<rom name="Super Mario Bros. 3Mix (Hack)(2014)(Southbird).nes" size="786448" crc="16b3fe50"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17803,7 +17811,7 @@
 		<description>Super Mario Bros. Special (Hack, Triforce89)</description>
 		<year>2020</year>
 		<manufacturer>Triforce89</manufacturer>
-		<rom name="Super Mario Bros. Special (Hack, Triforce89).nes" size="98320" crc="ab872e74"/>
+		<rom name="Super Mario Bros. Special (Hack)(2020)(Triforce89).nes" size="98320" crc="ab872e74"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17812,7 +17820,7 @@
 		<description>Super Mario Bros. Special (Hack, v1.0-rc1)</description>
 		<year>2021</year>
 		<manufacturer>Frantik</manufacturer>
-		<rom name="Super Mario Bros. Special (Hack, v1.0-rc1).nes" size="73744" crc="ba34bcad"/>
+		<rom name="Super Mario Bros. Special (Hack, v1.0-rc1)(2021)(Frantik).nes" size="73744" crc="ba34bcad"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17821,7 +17829,7 @@
 		<description>Super Mario Bros. Special 35th Anniversary (Hack, v1.3)</description>
 		<year>2021</year>
 		<manufacturer>Frantik</manufacturer>
-		<rom name="Super Mario Bros. Special 35th Anniversary (Hack, v1.3).nes" size="98320" crc="3800de83"/>
+		<rom name="Super Mario Bros. Special 35th Anniversary v1.3 (2021)(Frantik).nes" size="98320" crc="3800de83"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17830,7 +17838,7 @@
 		<description>Super Mario Bros. Special X1 (Hack)</description>
 		<year>2017</year>
 		<manufacturer>Messatu</manufacturer>
-		<rom name="Super Mario Bros. Special X1 (Hack).nes" size="98320" crc="5a44876f"/>
+		<rom name="Super Mario Bros. Special X1 (Hack)(2017)(Messatu).nes" size="98320" crc="5a44876f"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17839,7 +17847,7 @@
 		<description>Super Mario Bros. Two Players (Hack)</description>
 		<year>2018</year>
 		<manufacturer>Corpse Grinder</manufacturer>
-		<rom name="Super Mario Bros. Two Players (Hack).nes" size="73744" crc="393bc874"/>
+		<rom name="Super Mario Bros. Two Players (Hack)(2018)(Corpse Grinder).nes" size="73744" crc="393bc874"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17865,7 +17873,7 @@
 		<description>Super Mario World (Unl)</description>
 		<year>1995</year>
 		<manufacturer>J.Y. Company</manufacturer>
-		<rom name="Super Mario World (Unl).nes" size="786448" crc="6d5953a8"/>
+		<rom name="Super Mario World (Unl)(1995)(J.Y. Company).nes" size="786448" crc="6d5953a8"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -17941,7 +17949,7 @@
 		<description>Super Royal Pals (Hack)</description>
 		<year>2020</year>
 		<manufacturer>QUXNLADY</manufacturer>
-		<rom name="super royal pals (2020)(QUXNLADY).nes" size="40976" crc="62797e6e"/>
+		<rom name="Super Royal Pals (2020)(QUXNLADY).nes" size="40976" crc="62797e6e"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18127,7 +18135,7 @@
 		<description>Sword Master (Hack, Spanish)</description>
 		<year>2019</year>
 		<manufacturer>Wave</manufacturer>
-		<rom name="sword master (usa) - castellano v1.0.nes" size="262160" crc="0f7fcbaf"/>
+		<rom name="Sword Master T-Spa (2019)(Wave).nes" size="262160" crc="0f7fcbaf"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18422,7 +18430,7 @@
 		<description>Target Renegade (Hack, Spanish)</description>
 		<year>2017</year>
 		<manufacturer>Wave</manufacturer>
-		<rom name="target - renegade (usa) - castellano v1.0.nes" size="262160" crc="6754acae"/>
+		<rom name="Target Renegade T-Spa (2017)(Wave).nes" size="262160" crc="6754acae"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18611,10 +18619,10 @@
 	</game>
 	<game name="tmntcast" cloneof="tmnt" romof="tmnt" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
-		<description>Teenage Mutant Ninja Turtles (Hack, Spanish v0.9)</description>
-		<year>2016</year>
+		<description>Teenage Mutant Ninja Turtles (Hack, Spanish v2.0)</description>
+		<year>2022</year>
 		<manufacturer>Wave</manufacturer>
-		<rom name="teenage mutant ninja turtles (usa) - castellano v0.9.nes" size="262160" crc="30cd0997"/>
+		<rom name="Teenage Mutant Ninja Turtles T-Spa v2.0 (2022)(Wave).nes" size="262160" crc="2def2017"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18649,7 +18657,7 @@
 		<description>Teenage Mutant Ninja Turtles - Tournament Fighters (Hack, Spanish)</description>
 		<year>2020</year>
 		<manufacturer>Wave</manufacturer>
-		<rom name="teenage mutant ninja turtles - tournament fighters (usa) - castellano v1.0.nes" size="262160" crc="32eac8c5"/>
+		<rom name="Teenage Mutant Ninja Turtles - Tournament Fighters T-Spa (2020)(Wave).nes" size="262160" crc="32eac8c5"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18664,10 +18672,10 @@
 	</game>
 	<game name="tmntiiarcgamc" cloneof="tmntiiarcgam" romof="tmntiiarcgam" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
-		<description>Teenage Mutant Ninja Turtles II - The Arcade Game (Hack, Spanish v0.9)</description>
-		<year>2016</year>
+		<description>Teenage Mutant Ninja Turtles II - The Arcade Game (Hack, Spanish v2.0)</description>
+		<year>2022</year>
 		<manufacturer>Wave</manufacturer>
-		<rom name="teenage mutant ninja turtles ii - the arcade game (usa) - castellano v0.9.nes" size="524304" crc="b83bcec8"/>
+		<rom name="Teenage Mutant Ninja Turtles II - The Arcade Game T-Spa v2.0 (2022)(Wave).nes" size="524304" crc="522227b0"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18697,10 +18705,10 @@
 	</game>
 	<game name="tmntiiic" cloneof="tmntiii" romof="tmntiii" sourcefile="nes/d_nes.cpp">
 		<comment>Hack</comment>
-		<description>Teenage Mutant Ninja Turtles III - The Manhattan Project (Hack, Spanish v0.91)</description>
-		<year>2017</year>
+		<description>Teenage Mutant Ninja Turtles III - The Manhattan Project (Hack, Spanish v2.3)</description>
+		<year>2022</year>
 		<manufacturer>Wave</manufacturer>
-		<rom name="teenage mutant ninja turtles iii - the manhattan project (usa) - castellano v0.91.nes" size="524304" crc="3e9ddb5c"/>
+		<rom name="Teenage Mutant Ninja Turtles III - The Manhattan Project T-Spa v2.3 (2022)(Wave).nes" size="524304" crc="c825b0fd"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18957,8 +18965,8 @@
 	<game name="thexder" sourcefile="nes/d_nes.cpp">
 		<description>Thexder (Japan)</description>
 		<year>1985</year>
-		<manufacturer>Square</manufacturer>
-		<rom name="Thexder (Japan).nes" size="40976" crc="f82c7789"/>
+		<manufacturer>Squaresoft</manufacturer>
+		<rom name="Thexder (Japan)(1985)(Squaresoft).nes" size="40976" crc="f82c7789"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18984,7 +18992,7 @@
 		<description>Three Stooges (USA)</description>
 		<year>1989</year>
 		<manufacturer>Activision</manufacturer>
-		<rom name="Three Stooges (USA).nes" size="262160" crc="3e3ff3c4"/>
+		<rom name="Three Stooges (USA)(1989)(Activision).nes" size="262160" crc="3e3ff3c4"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
@@ -18992,7 +19000,7 @@
 		<description>Thunder &amp; Lightning (USA)</description>
 		<year>1990</year>
 		<manufacturer>Romstar</manufacturer>
-		<rom name="Thunder &amp; Lightning (USA).nes" size="163856" crc="0b80795e"/>
+		<rom name="Thunder &amp; Lightning (USA)(1990)(Romstar).nes" size="163856" crc="0b80795e"/>
 		<video type="raster" orientation="horizontal" width="256" height="224" aspectx="256" aspecty="224"/>
 		<driver status="good"/>
 	</game>
diff --git a/gamelist.txt b/gamelist.txt
index 9310e5aef..4e18cdd45 100644
--- a/gamelist.txt
+++ b/gamelist.txt
@@ -1,6 +1,6 @@
 This list contains all games supported by FinalBurn Neo.
 
-20879 games supported in total; X = excluded from build; D = included in debug build only; NW = not working
+20885 games supported in total; X = excluded from build; D = included in debug build only; NW = not working
 
 +---------------------------------+--------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------+-------------+-----------------------------------------------------------------+--------------------------------+-------------------------------------------------------------------------------------+
 | name                            | status | full name                                                                                                                                                              | parent                  | year        | company                                                         | hardware                       | remarks                                                                             |
@@ -670,7 +670,7 @@ This list contains all games supported by FinalBurn Neo.
 | aliens3                         |        | Aliens (World set 3)                                                                                                                                                   | aliens                  | 1990        | Konami                                                          | GX875                          |                                                                                     |
 | aliens4                         |        | Aliens (World set 4)                                                                                                                                                   | aliens                  | 1990        | Konami                                                          | GX875                          |                                                                                     |
 | fds_aliensfix                   |        | Aliens - Alien 2 (Fix Hack)                                                                                                                                            |                         | 2017        | lancuster                                                       | Miscellaneous                  |                                                                                     |
-| fds_aliens                      |        | Aliens - Alien 2 (Japan) (Prototype)                                                                                                                                   | fds_aliensfix           | 1987        | Square                                                          | Miscellaneous                  |                                                                                     |
+| fds_aliens                      |        | Aliens - Alien 2 (Japan) (Prototype)                                                                                                                                   | fds_aliensfix           | 1987        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | msx_aliens                      |        | Aliens - Alien 2 (Japan)                                                                                                                                               |                         | 1987        | Square                                                          | MSX                            |                                                                                     |
 | msx_aliensb                     |        | Aliens - Alien 2 (Japan, Alt 2)                                                                                                                                        | msx_aliens              | 1987        | Square                                                          | MSX                            |                                                                                     |
 | msx_aliensa                     |        | Aliens - Alien 2 (Japan, Alt)                                                                                                                                          | msx_aliens              | 1987        | Square                                                          | MSX                            |                                                                                     |
@@ -3820,6 +3820,7 @@ This list contains all games supported by FinalBurn Neo.
 | ccastlesp                       |        | Crystal Castles (version 3, Spanish)                                                                                                                                   | ccastles                | 1983        | Atari                                                           | Miscellaneous                  |                                                                                     |
 | ccastles                        |        | Crystal Castles (version 4)                                                                                                                                            |                         | 1983        | Atari                                                           | Miscellaneous                  |                                                                                     |
 | spec_cryscast                   |        | Crystal Castles Diamond Plateaus in Space (48K)                                                                                                                        |                         | 1986        | U.S. Gold                                                       | ZX Spectrum                    |                                                                                     |
+| fds_crystaldrag                 |        | Crystal Dragon (Hack, English)                                                                                                                                         |                         | 2003        | Mute                                                            | Miscellaneous                  |                                                                                     |
 | spec_dizzy7remake               |        | Crystal Kingdom Dizzy - Remake (128K) (HB)                                                                                                                             |                         | 2017        | Codemasters                                                     | ZX Spectrum                    |                                                                                     |
 | gg_crystalw                     |        | Crystal Warriors (Euro, USA)                                                                                                                                           |                         | 1992        | Sega                                                            | Sega Game Gear                 |                                                                                     |
 | md_crystlpts                    |        | Crystal's Pony Tale (Hack, Spanish)                                                                                                                                    | md_crystlpt             | 2019        | Wave                                                            | Sega Megadrive                 |                                                                                     |
@@ -5989,14 +5990,14 @@ This list contains all games supported by FinalBurn Neo.
 | nes_finalfantasyi               |        | Final Fantasy (Hack, Italian)                                                                                                                                          | nes_finalfantasy        | 2020        | FIUMI                                                           | Miscellaneous                  |                                                                                     |
 | nes_finalfantasyc               |        | Final Fantasy (Hack, Spanish)                                                                                                                                          | nes_finalfantasy        | 2002        | Cunaaao                                                         | Miscellaneous                  |                                                                                     |
 | nes_finalfantasy                |        | Final Fantasy (USA)                                                                                                                                                    |                         | 1990        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
-| nes_finalfan12                  |        | Final Fantasy 1 & 2 (Hack, English)                                                                                                                                    |                         | 2016        | Demiforce                                                       | Miscellaneous                  |                                                                                     |
-| nes_finalfan12j                 |        | Final Fantasy 1 & 2 (Japan)                                                                                                                                            | nes_finalfan12          | 1994        | Square                                                          | Miscellaneous                  |                                                                                     |
+| nes_finalfan12                  |        | Final Fantasy 1 & 2 (Hack, English)                                                                                                                                    |                         | 2001        | Demiforce                                                       | Miscellaneous                  |                                                                                     |
+| nes_finalfan12j                 |        | Final Fantasy 1 & 2 (Japan)                                                                                                                                            | nes_finalfan12          | 1994        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | nes_finalfantasyiic             |        | Final Fantasy II (Hack, Spanish)                                                                                                                                       | nes_finalfantasyii      | 20XX?       | <unknown>                                                       | Miscellaneous                  |                                                                                     |
-| nes_finalfantasyii              |        | Final Fantasy II (USA, Prototype)                                                                                                                                      |                         | 1991        | Square                                                          | Miscellaneous                  |                                                                                     |
+| nes_finalfantasyii              |        | Final Fantasy II (USA, Prototype)                                                                                                                                      |                         | 1991        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | nes_finalfaniiic                |        | Final Fantasy III (Hack, Spanish)                                                                                                                                      | nes_finalfaniii         | 2015        | Maeson                                                          | Miscellaneous                  |                                                                                     |
-| nes_finalfaniii                 |        | Final Fantasy III (Japan)                                                                                                                                              |                         | 1990        | Square                                                          | Miscellaneous                  |                                                                                     |
+| nes_finalfaniii                 |        | Final Fantasy III (Japan)                                                                                                                                              |                         | 1990        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | nes_finalfanvii                 |        | Final Fantasy VII (China) (Unl)                                                                                                                                        | nes_finalfanviiadvch    | 2005        | ShenZhen Nanjing Technology                                     | Miscellaneous                  |                                                                                     |
-| nes_finalfanviiadvch            |        | Final Fantasy VII - Advent Children (Hack, English)                                                                                                                    |                         | 2015        | Lindblum                                                        | Miscellaneous                  |                                                                                     |
+| nes_finalfanviiadvch            |        | Final Fantasy VII - Advent Children (Hack, English)                                                                                                                    |                         | 2013        | Lindblum                                                        | Miscellaneous                  |                                                                                     |
 | spec_finalfight                 |        | Final Fight (128K)                                                                                                                                                     |                         | 1991        | U.S. Gold                                                       | ZX Spectrum                    | Press 'A' to use controller                                                         |
 | ffigh1v2                        |        | Final Fight (1v2, Hack)                                                                                                                                                | ffight                  | 2017        | hack                                                            | CPS1                           |                                                                                     |
 | ffightbl                        |        | Final Fight (bootleg set 1 (with 2xYM2203 + 2xMSM5205), World)                                                                                                         | ffight                  | 1990        | bootleg                                                         | CPS1                           |                                                                                     |
@@ -6044,7 +6045,7 @@ This list contains all games supported by FinalBurn Neo.
 | pce_finalmtladies               |        | Final Match Tennis - Ladies (Super CD-Rom Hack)                                                                                                                        |                         | 2002-2016   | Human - Mooz                                                    | PC Engine                      |                                                                                     |
 | spec_finalmatrix                |        | Final Matrix, The (48K)                                                                                                                                                |                         | 1987        | Gremlin Graphics                                                | ZX Spectrum                    |                                                                                     |
 | nes_finalmissionjc              |        | Final Mission (Hack, Chinese)                                                                                                                                          | nes_scat                | 2021        | Ni You De Wu Cai Yu                                             | Miscellaneous                  |                                                                                     |
-| nes_finalmission                |        | Final Mission (Hack, English)                                                                                                                                          | nes_scat                | 1990        | Natsume                                                         | Miscellaneous                  |                                                                                     |
+| nes_finalmission                |        | Final Mission (Hack, English)                                                                                                                                          | nes_scat                | 2014        | Stardust Crusaders                                              | Miscellaneous                  |                                                                                     |
 | nes_finalmissionj               |        | Final Mission (Japan)                                                                                                                                                  | nes_scat                | 1990        | Natsume                                                         | Miscellaneous                  |                                                                                     |
 | pce_finalsol                    |        | Final Soldier (Japan)                                                                                                                                                  |                         | 1991        | Hudson Soft                                                     | PC Engine                      |                                                                                     |
 | pce_finalsols                   |        | Final Soldier - Special Version (Japan)                                                                                                                                | pce_finalsol            | 1991        | Hudson Soft                                                     | PC Engine                      |                                                                                     |
@@ -6926,7 +6927,8 @@ This list contains all games supported by FinalBurn Neo.
 | spec_gimmebright                |        | Gimme Bright (48K) (HB, v2.0)                                                                                                                                          |                         | 2011        | Climacus                                                        | ZX Spectrum                    |                                                                                     |
 | nes_gimmickc                    |        | Gimmick! (Hack, Chinese)                                                                                                                                               | nes_gimmick             | 2021        | Lei Jing Ling                                                   | Miscellaneous                  |                                                                                     |
 | nes_gimmick                     |        | Gimmick! (Japan)                                                                                                                                                       |                         | 1992        | Sunsoft                                                         | Miscellaneous                  |                                                                                     |
-| fds_gingaden                    |        | Ginga Denshou - Galaxy Odyssey (Japan)                                                                                                                                 |                         | 1986        | Imagineer                                                       | Miscellaneous                  |                                                                                     |
+| fds_gingaden                    |        | Ginga Denshou - Galaxy Odyssey (Hack, English)                                                                                                                         |                         | 2015        | Chris M. Covell                                                 | Miscellaneous                  |                                                                                     |
+| fds_gingadenj                   |        | Ginga Denshou - Galaxy Odyssey (Japan)                                                                                                                                 | fds_gingaden            | 1986        | Imagineer                                                       | Miscellaneous                  |                                                                                     |
 | ginganin                        |        | Ginga Ninkyouden (set 1)                                                                                                                                               |                         | 1987        | Jaleco                                                          | Miscellaneous                  |                                                                                     |
 | ginganina                       |        | Ginga Ninkyouden (set 2)                                                                                                                                               | ginganin                | 1987        | Jaleco                                                          | Miscellaneous                  |                                                                                     |
 | gteikokub                       |        | Gingateikoku no Gyakushu (bootleg set 1)                                                                                                                               | uniwars                 | 1980        | bootleg                                                         | Galaxian                       |                                                                                     |
@@ -7723,8 +7725,8 @@ This list contains all games supported by FinalBurn Neo.
 | sg1k_heibaiqi                   |        | Hei Bai Qi (Taiwan)                                                                                                                                                    | sg1k_othello            | 1985?       | Aaronix                                                         | Sega SG-1000                   |                                                                                     |
 | md_heitao                       |        | Hei Tao 2 - Super Big 2 (China) (Unl)                                                                                                                                  |                         | 1996        | King Tec                                                        | Sega Megadrive                 |                                                                                     |
 | heiankyo                        |        | Heiankyo Alien                                                                                                                                                         |                         | 1979        | Denki Onkyo                                                     | Vic Dual                       |                                                                                     |
-| nes_heisetenbak                 |        | Heisei Tensai Bakabon (Hack, English)                                                                                                                                  |                         | 2007        | KingMike                                                        | Miscellaneous                  |                                                                                     |
 | nes_heisetenbakj                |        | Heisei Tensai Bakabon (Japan)                                                                                                                                          | nes_heisetenbak         | 1991        | Namco                                                           | Miscellaneous                  |                                                                                     |
+| nes_heisetenbak                 |        | Heisei Tensai Bakabon ~ Genius Bakabon, The (Hack, English)                                                                                                            |                         | 2007        | KingMike's Translations                                         | Miscellaneous                  |                                                                                     |
 | nes_heist                       |        | Heist (HB)                                                                                                                                                             |                         | 2022        | Johnybot                                                        | Miscellaneous                  |                                                                                     |
 | msx_heist                       |        | Heist, The (Japan)                                                                                                                                                     |                         | 1985        | Comptiq                                                         | MSX                            |                                                                                     |
 | cv_heist                        |        | Heist, The                                                                                                                                                             |                         | 1983        | Micro Fun                                                       | ColecoVision                   |                                                                                     |
@@ -7808,7 +7810,7 @@ This list contains all games supported by FinalBurn Neo.
 | chwy                            |        | Highway Chase (DECO Cassette) (US)                                                                                                                                     |                         | 1980        | Data East Corporation                                           | Cassette System                |                                                                                     |
 | spec_highenco                   |        | Highway Encounter (48K)                                                                                                                                                |                         | 1985        | Vortex Software                                                 | ZX Spectrum                    |                                                                                     |
 | msx_highwayen                   |        | Highway Encounter (Euro, Spanish)                                                                                                                                      |                         | 1985        | Dinamic Software                                                | MSX                            |                                                                                     |
-| nes_highwaystar                 |        | Highway Star (Japan)                                                                                                                                                   | nes_radracer            | 1987        | Square                                                          | Miscellaneous                  |                                                                                     |
+| nes_highwaystar                 |        | Highway Star (Japan)                                                                                                                                                   | nes_radracer            | 1987        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | nes_hikarnosenphoulgaon         |        | Hikari no Senshi Photon - The Ultimate Game on Planet Earth (Hack, English)                                                                                            |                         | 2003        | KingMike                                                        | Miscellaneous                  |                                                                                     |
 | nes_hikarnosenphoulgaonjlea     |        | Hikari no Senshi Photon - The Ultimate Game on Planet Earth (Japan)                                                                                                    | nes_hikarnosenphoulgaon | 1987        | Takara                                                          | Miscellaneous                  |                                                                                     |
 | fds_hikarshi                    |        | Hikari Shinwa - Palutena no Kagami (Hack, English)                                                                                                                     |                         | 2023        | BlackPaladin                                                    | Miscellaneous                  | Myth of Light Palutena's Mirror, The                                                |
@@ -8492,8 +8494,8 @@ This list contains all games supported by FinalBurn Neo.
 | nes_jester                      |        | Jester (HB)                                                                                                                                                            |                         | 2020        | Acclaim - CollectorVision                                       | Miscellaneous                  |                                                                                     |
 | nes_jesterv2                    |        | Jester (HB, Alt)                                                                                                                                                       | nes_jester              | 2023        | Acclaim - Mega Cat Studios                                      | Miscellaneous                  |                                                                                     |
 | spec_jesterquest                |        | Jester Quest (128K)                                                                                                                                                    |                         | 1988        | Zenobi Software                                                 | ZX Spectrum                    |                                                                                     |
-| nes_jesus                       |        | Jesus - Kyoufu no Bio Monster (Hack, English)                                                                                                                          |                         | 2016        | Stardust Crusaders                                              | Miscellaneous                  |                                                                                     |
 | nes_jesusj                      |        | Jesus - Kyoufu no Bio Monster (Japan)                                                                                                                                  | nes_jesus               | 1989        | King Records                                                    | Miscellaneous                  |                                                                                     |
+| nes_jesus                       |        | Jesus: Tale of the Dreadful Bio-Monster (Hack, English)                                                                                                                |                         | 2016        | Stardust Crusaders                                              | Miscellaneous                  |                                                                                     |
 | spec_jetbikesim5                |        | Jet Bike Simulator - Coasts Expert (48K)                                                                                                                               | spec_jetbikesim2        | 1988        | Codemasters                                                     | ZX Spectrum                    |                                                                                     |
 | spec_jetbikesim2                |        | Jet Bike Simulator - Coasts Standard (48K)                                                                                                                             |                         | 1988        | Codemasters                                                     | ZX Spectrum                    |                                                                                     |
 | spec_jetbikesim6                |        | Jet Bike Simulator - Docks Expert (48K)                                                                                                                                | spec_jetbikesim3        | 1988        | Codemasters                                                     | ZX Spectrum                    |                                                                                     |
@@ -8555,7 +8557,7 @@ This list contains all games supported by FinalBurn Neo.
 | pce_jinmu                       |        | Jinmu Denshou (Japan)                                                                                                                                                  |                         | 1989        | Big Club                                                        | PC Engine                      |                                                                                     |
 | jitsupro                        |        | Jitsuryoku!! Pro Yakyuu (Japan)                                                                                                                                        |                         | 1989        | Jaleco                                                          | Mega System 1                  |                                                                                     |
 | md_jiujim                       |        | Jiu Ji Ma Jiang II - Ye Yan Bian (China) (Unl)                                                                                                                         |                         | 199?        | <unknown>                                                       | Sega Megadrive                 |                                                                                     |
-| nes_jj                          |        | JJ (Japan)                                                                                                                                                             |                         | 1987        | Square                                                          | Miscellaneous                  |                                                                                     |
+| nes_jj                          |        | JJ (Japan)                                                                                                                                                             |                         | 1987        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | jockeyc                         | D NW   | Jockey Club (v1.18)                                                                                                                                                    |                         | 1990        | Seta (Visco license)                                            | Seta                           |                                                                                     |
 | jockeygp                        |        | Jockey Grand Prix (set 1)                                                                                                                                              |                         | 2001        | Sun Amusement / BrezzaSoft                                      | Neo Geo MVS                    |                                                                                     |
 | jockeygpa                       |        | Jockey Grand Prix (set 2)                                                                                                                                              | jockeygp                | 2001        | Sun Amusement / BrezzaSoft                                      | Neo Geo MVS                    |                                                                                     |
@@ -8695,13 +8697,13 @@ This list contains all games supported by FinalBurn Neo.
 | gg_junctionj                    |        | Junction (Japan)                                                                                                                                                       | gg_junction             | 1991        | Micronet                                                        | Sega Game Gear                 |                                                                                     |
 | md_junction                     |        | Junction (Japan, USA)                                                                                                                                                  |                         | 1990        | Micronet                                                        | Sega Megadrive                 |                                                                                     |
 | gg_junction                     |        | Junction (USA)                                                                                                                                                         |                         | 1991        | Micronet                                                        | Sega Game Gear                 |                                                                                     |
-| nes_junglebooktheb              |        | Jungle Book, The (Brightness fix)                                                                                                                                      | nes_junglebookthe       | 2020        | Ilya Indigo                                                     | Miscellaneous                  |                                                                                     |
 | gg_jungle                       |        | Jungle Book, The (Euro)                                                                                                                                                |                         | 1994        | Virgin Interactive                                              | Sega Game Gear                 |                                                                                     |
 | sms_jungle                      |        | Jungle Book, The (Euro, Brazil)                                                                                                                                        |                         | 1994        | Virgin Interactive                                              | Sega Master System             |                                                                                     |
 | sms_junglec                     |        | Jungle Book, The (Hack, Spanish v1.0)                                                                                                                                  | sms_jungle              | 2018        | Wave                                                            | Sega Master System             |                                                                                     |
 | nes_junglebookthec              |        | Jungle Book, The (Hack, Spanish)                                                                                                                                       | nes_junglebookthe       | 2018        | Wave                                                            | Miscellaneous                  |                                                                                     |
 | gg_jungleu                      |        | Jungle Book, The (USA)                                                                                                                                                 | gg_jungle               | 1994        | Virgin Interactive                                              | Sega Game Gear                 |                                                                                     |
 | nes_junglebookthe               |        | Jungle Book, The (USA)                                                                                                                                                 |                         | 1994        | Virgin Games                                                    | Miscellaneous                  |                                                                                     |
+| nes_junglebooktheb              |        | Jungle Book, The - Brightness Fix (Hack)                                                                                                                               | nes_junglebookthe       | 2020        | Ilya Indigo                                                     | Miscellaneous                  |                                                                                     |
 | jungleby                        |        | Jungle Boy (bootleg)                                                                                                                                                   | junglek                 | 1982        | bootleg                                                         | Taito SJ System                |                                                                                     |
 | junglehbr                       |        | Jungle Hunt (Brazil)                                                                                                                                                   | junglek                 | 1983        | Taito do Brasil                                                 | Taito SJ System                |                                                                                     |
 | jungleh                         |        | Jungle Hunt (US)                                                                                                                                                       | junglek                 | 1982        | Taito America Corporation                                       | Taito SJ System                |                                                                                     |
@@ -8813,8 +8815,8 @@ This list contains all games supported by FinalBurn Neo.
 | pce_shubibi                     |        | Kaizou Choujin Shubibinman (Japan)                                                                                                                                     |                         | 1989        | NCS                                                             | PC Engine                      |                                                                                     |
 | pce_shubibi2                    |        | Kaizou Choujin Shubibinman 2 - Aratanaru Teki (Japan)                                                                                                                  |                         | 1991        | Masiya                                                          | PC Engine                      |                                                                                     |
 | nes_kakefkunnojumte             |        | Kakefu-kun no Jump Tengoku - Speed Jigoku (Japan)                                                                                                                      |                         | 1988        | Vic Tokai                                                       | Miscellaneous                  |                                                                                     |
-| fds_kalinnotsurugi              |        | Kalin no Tsurugi (Hack, English)                                                                                                                                       |                         | 2005        | filler, KingMike, satsu                                         | Miscellaneous                  |                                                                                     |
 | fds_kalinnotsurugij             |        | Kalin no Tsurugi (Japan)                                                                                                                                               | fds_kalinnotsurugi      | 1987        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
+| fds_kalinnotsurugi              |        | Kalin no Tsurugi ~ Sword of Kalin, The (Hack, English)                                                                                                                 |                         | 2005        | filler, KingMike, satsu                                         | Miscellaneous                  |                                                                                     |
 | kamakazi3                       |        | Kamakazi III (hack of 'Super Galaxians')                                                                                                                               | galaxian                | 1979        | hack                                                            | Galaxian                       |                                                                                     |
 | nes_kamenoong                   |        | Kame no Ongaeshi - Urashima Densetsu (Japan)                                                                                                                           |                         | 1988        | Hudson Soft                                                     | Miscellaneous                  |                                                                                     |
 | nes_kamennoninaka               |        | Kamen no Ninja - Akakage (Japan)                                                                                                                                       |                         | 1988        | Toei Animation                                                  | Miscellaneous                  |                                                                                     |
@@ -8993,7 +8995,7 @@ This list contains all games supported by FinalBurn Neo.
 | kog                             |        | King of Gladiator (bootleg of The King of Fighters '97)                                                                                                                | kof97                   | 1997        | bootleg                                                         | Neo Geo MVS                    |                                                                                     |
 | kogplus                         |        | King of Gladiator Plus (The King of Fighters '97 bootleg)                                                                                                              | kof97                   | 1997        | bootleg                                                         | Neo Geo MVS                    |                                                                                     |
 | nes_kingofkings                 |        | King of Kings (Japan)                                                                                                                                                  |                         | 1988        | Namco                                                           | Miscellaneous                  |                                                                                     |
-| nes_kingkin                     |        | King of Kings, The (USA) (v5.0) (Unl)                                                                                                                                  |                         | 1991        | Wisdom Tree                                                     | Miscellaneous                  |                                                                                     |
+| nes_kingkin                     |        | King of Kings, The (USA, v5.0) (Unl)                                                                                                                                   |                         | 1991        | Wisdom Tree                                                     | Miscellaneous                  |                                                                                     |
 | md_kotm                         |        | King of the Monsters (Euro)                                                                                                                                            |                         | 1993        | Sega                                                            | Sega Megadrive                 |                                                                                     |
 | md_kotmj                        |        | King of the Monsters (Japan)                                                                                                                                           | md_kotm                 | 1993        | Sega                                                            | Sega Megadrive                 |                                                                                     |
 | kotm                            |        | King of the Monsters (set 1)                                                                                                                                           |                         | 1991        | SNK                                                             | Neo Geo MVS                    |                                                                                     |
@@ -9009,9 +9011,10 @@ This list contains all games supported by FinalBurn Neo.
 | md_kingsbty                     |        | King's Bounty - The Conqueror's Quest (Euro, USA)                                                                                                                      |                         | 1991        | Electronic Arts                                                 | Sega Megadrive                 |                                                                                     |
 | md_kingsbtys                    |        | King's Bounty - The Conqueror's Quest (Hack, Spanish)                                                                                                                  | md_kingsbty             | 2020        | Wave                                                            | Sega Megadrive                 |                                                                                     |
 | msx_kingkngt                    |        | King's Knight (Japan)                                                                                                                                                  |                         | 1986        | Square                                                          | MSX                            |                                                                                     |
+| nes_kingsknightj                |        | King's Knight (Japan)                                                                                                                                                  | nes_kingsknight         | 1986        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | msx_kingkngtb                   |        | King's Knight (Japan, Alt 2)                                                                                                                                           | msx_kingkngt            | 1986        | Square                                                          | MSX                            |                                                                                     |
 | msx_kingkngta                   |        | King's Knight (Japan, Alt)                                                                                                                                             | msx_kingkngt            | 1986        | Square                                                          | MSX                            |                                                                                     |
-| nes_kingsknight                 |        | King's Knight (USA)                                                                                                                                                    |                         | 1986        | Square                                                          | Miscellaneous                  |                                                                                     |
+| nes_kingsknight                 |        | King's Knight (USA)                                                                                                                                                    |                         | 1989        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | sms_kingqst                     |        | King's Quest - Quest for the Crown (USA)                                                                                                                               |                         | 1989        | Parker Brothers                                                 | Sega Master System             |                                                                                     |
 | sms_kingqstp                    |        | King's Quest - Quest for the Crown (USA, Prototype)                                                                                                                    | sms_kingqst             | 1989        | Parker Brothers                                                 | Sega Master System             |                                                                                     |
 | nes_kingsquestv                 |        | King's Quest V (USA)                                                                                                                                                   |                         | 1992        | Konami                                                          | Miscellaneous                  |                                                                                     |
@@ -10705,8 +10708,8 @@ This list contains all games supported by FinalBurn Neo.
 | msisaac                         |        | Metal Soldier Isaac II                                                                                                                                                 |                         | 1985        | Taito Corporation                                               | Miscellaneous                  | buggy game due to unemulated protection MCU                                         |
 | md_msonichd                     |        | Metal Sonic Hyperdrive (Hack, v4.2)                                                                                                                                    | md_sonic                | 2014        | Darkon                                                          | Sega Megadrive                 |                                                                                     |
 | pce_metlstok                    |        | Metal Stoker (Japan)                                                                                                                                                   |                         | 1991        | Face                                                            | PC Engine                      |                                                                                     |
-| nes_metalstormrr                |        | Metal Storm (Re-Release)                                                                                                                                               | nes_metalstorm          | 2019        | Irem - Retro-bit                                                | Miscellaneous                  |                                                                                     |
 | nes_metalstorm                  |        | Metal Storm (USA)                                                                                                                                                      |                         | 1991        | Irem                                                            | Miscellaneous                  |                                                                                     |
+| nes_metalstormrr                |        | Metal Storm - Re-Release (Mapper 268)                                                                                                                                  | nes_metalstorm          | 2019        | Irem Corp. - Retro-bit                                          | Miscellaneous                  |                                                                                     |
 | metmqstr                        |        | Metamoqester (World)                                                                                                                                                   |                         | 1995        | Banpresto / Pandorabox                                          | Cave                           |                                                                                     |
 | metamrpha                       |        | Metamorphic Force (ver AAA)                                                                                                                                            | metamrph                | 1993        | Konami                                                          | GX224                          |                                                                                     |
 | metamrphe                       |        | Metamorphic Force (ver EAA - alternate)                                                                                                                                | metamrph                | 1993        | Konami                                                          | GX224                          |                                                                                     |
@@ -13897,7 +13900,7 @@ This list contains all games supported by FinalBurn Neo.
 | nes_radracerc                   |        | Rad Racer (Hack, Chinese)                                                                                                                                              | nes_radracer            | 2010        | Jiu Ban                                                         | Miscellaneous                  |                                                                                     |
 | nes_radracer                    |        | Rad Racer (USA)                                                                                                                                                        |                         | 1988        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
 | nes_radraceriic                 |        | Rad Racer II (Hack, Chinese)                                                                                                                                           | nes_radracerii          | 2010        | Jiu Ban                                                         | Miscellaneous                  |                                                                                     |
-| nes_radracerii                  |        | Rad Racer II (USA)                                                                                                                                                     |                         | 1990        | Square                                                          | Miscellaneous                  |                                                                                     |
+| nes_radracerii                  |        | Rad Racer II (USA)                                                                                                                                                     |                         | 1990        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | nes_radrac                      |        | Rad Racket - Deluxe Tennis II (USA)                                                                                                                                    |                         | 1991        | American Video Entertainment                                    | Miscellaneous                  |                                                                                     |
 | radrj                           |        | Rad Rally (Japan)                                                                                                                                                      | radr                    | 1991        | Sega                                                            | System 32                      | Small GFX Issues                                                                    |
 | radru                           |        | Rad Rally (US)                                                                                                                                                         | radr                    | 1991        | Sega                                                            | System 32                      | Small GFX Issues                                                                    |
@@ -14900,6 +14903,8 @@ This list contains all games supported by FinalBurn Neo.
 | nes_sanriocupj                  |        | Sanrio Cup - Pon Pon Volley (Japan)                                                                                                                                    | nes_sanriocup           | 1992        | Character Soft                                                  | Miscellaneous                  |                                                                                     |
 | nes_sansaranaga                 |        | Sansara Naga (Hack, English)                                                                                                                                           |                         | 2014        | Stardust Crusaders                                              | Miscellaneous                  |                                                                                     |
 | nes_sansaranagaj                |        | Sansara Naga (Japan)                                                                                                                                                   | nes_sansaranaga         | 1990        | Victor                                                          | Miscellaneous                  |                                                                                     |
+| fds_santaclausj                 |        | Santa Claus no Takarabako (Japan)                                                                                                                                      | fds_santaclause         | 1987        | Data East                                                       | Miscellaneous                  |                                                                                     |
+| fds_santaclause                 |        | Santa Claus' Toybox (Hack, English v1.01)                                                                                                                              |                         | 2003        | Gil Galad                                                       | Miscellaneous                  |                                                                                     |
 | spec_sxmascaper                 |        | Santa's Xmas Caper (48K)                                                                                                                                               |                         | 1990        | Zeppelin Games                                                  | ZX Spectrum                    | Set '1 using sinclair' to use controller                                            |
 | santaball                       |        | SantaBall - Christmas Tennis Game                                                                                                                                      |                         | 2012        | M.Priewe / NeoHomeBrew                                          | Neo Geo MVS                    |                                                                                     |
 | pce_santatlantean               |        | Santatlantean (HB)                                                                                                                                                     |                         | 2014        | Aetherbyte                                                      | PC Engine                      |                                                                                     |
@@ -15469,7 +15474,7 @@ This list contains all games supported by FinalBurn Neo.
 | silvmil                         |        | Silver Millennium                                                                                                                                                      |                         | 1995        | Para                                                            | Miscellaneous                  |                                                                                     |
 | nes_silversurfer                |        | Silver Surfer (USA)                                                                                                                                                    |                         | 1990        | Arcadia                                                         | Miscellaneous                  |                                                                                     |
 | sms_silvervalley                |        | Silver Valley (HB)                                                                                                                                                     |                         | 2018        | MikGames - Enrique Ruiz                                         | Sega Master System             |                                                                                     |
-| fds_silvi                       |        | Silviana - Ai Ippai no Little Angel (Hack, English)                                                                                                                    |                         | 2002        | Mute                                                            | Miscellaneous                  |                                                                                     |
+| fds_silvi                       |        | Silviana (Hack, English)                                                                                                                                               |                         | 2002        | Mute                                                            | Miscellaneous                  |                                                                                     |
 | fds_silvij                      |        | Silviana - Ai Ippai no Little Angel (Japan)                                                                                                                            | fds_silvi               | 1988        | Pack-In-Video                                                   | Miscellaneous                  |                                                                                     |
 | spec_simcity                    |        | Sim City (48K)                                                                                                                                                         |                         | 1989        | Infogrames                                                      | ZX Spectrum                    |                                                                                     |
 | nes_simcity                     |        | Sim City (Prototype)                                                                                                                                                   |                         | 1991        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
@@ -17024,6 +17029,7 @@ This list contains all games supported by FinalBurn Neo.
 | nes_sugorque                    |        | Sugoro Quest - Dice no Senshitachi (Hack, English)                                                                                                                     |                         | 2007        | AlanMidas                                                       | Miscellaneous                  |                                                                                     |
 | nes_sugorquej                   |        | Sugoro Quest - Dice no Senshitachi (Japan)                                                                                                                             | nes_sugorque            | 1991        | Technos                                                         | Miscellaneous                  |                                                                                     |
 | sms_suhocheo                    |        | Suho Jeonsa (Korea)                                                                                                                                                    |                         | 1994        | Open Corp.                                                      | Sega Master System             |                                                                                     |
+| fds_suishoudrag                 |        | Suishou no Dragon (Japan)                                                                                                                                              | fds_crystaldrag         | 1986        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | msx_suitemacabre                |        | Suite Macabre (HB)                                                                                                                                                     |                         | 2022        | Maltanto                                                        | MSX                            |                                                                                     |
 | nes_sukebandeka3                |        | Sukeban Deka 3 (Hack, English)                                                                                                                                         |                         | 2016        | MrRichard999                                                    | Miscellaneous                  |                                                                                     |
 | nes_sukebandeka3j               |        | Sukeban Deka 3 (Japan)                                                                                                                                                 | nes_sukebandeka3        | 1987        | Toei Animation                                                  | Miscellaneous                  |                                                                                     |
@@ -17260,8 +17266,8 @@ This list contains all games supported by FinalBurn Neo.
 | md_suploco                      |        | Super Locomotive (Mega Drive Mini 2 Edition)                                                                                                                           |                         | 2022        | Sega                                                            | Sega Megadrive                 |                                                                                     |
 | suprloco                        |        | Super Locomotive (Rev.A)                                                                                                                                               |                         | 1982        | Sega                                                            | Miscellaneous                  |                                                                                     |
 | suprlocoo                       |        | Super Locomotive                                                                                                                                                       | suprloco                | 1982        | Sega                                                            | Miscellaneous                  |                                                                                     |
-| fds_superlodrun                 |        | Super Lode Runner (Japan)                                                                                                                                              |                         | 1987        | Irem                                                            | Miscellaneous                  |                                                                                     |
-| fds_superlodrunii               |        | Super Lode Runner II (Japan)                                                                                                                                           |                         | 1987        | Irem                                                            | Miscellaneous                  |                                                                                     |
+| fds_superlodrun                 |        | Super Lode Runner (Japan)                                                                                                                                              |                         | 1987        | Irem Corp.                                                      | Miscellaneous                  |                                                                                     |
+| fds_superlodrunii               |        | Super Lode Runner II (Japan)                                                                                                                                           |                         | 1987        | Irem Corp.                                                      | Miscellaneous                  |                                                                                     |
 | suplup                          |        | Super Lup Lup Puzzle / Zhuan Zhuan Puzzle (version 4.0 / 990518)                                                                                                       |                         | 1999        | Omega System                                                    | Miscellaneous                  |                                                                                     |
 | md_smario2                      |        | Super Mario 2 (Taiwan) (Unl)                                                                                                                                           |                         | 1998        | Gamtec                                                          | Sega Megadrive                 |                                                                                     |
 | md_smario2a                     |   NW   | Super Mario 2 (Taiwan, Alt) (Unl)                                                                                                                                      | md_smario2              | 1998        | Gamtec                                                          | Sega Megadrive                 |                                                                                     |
@@ -17274,12 +17280,12 @@ This list contains all games supported by FinalBurn Neo.
 | nes_smb                         |        | Super Mario Bros. (World)                                                                                                                                              |                         | 1985        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
 | md_smbbc                        |        | Super Mario Bros. + Battle City (Russia) (Unl)                                                                                                                         |                         | 199?        | <unknown>                                                       | Sega Megadrive                 |                                                                                     |
 | nes_smb2c                       |        | Super Mario Bros. 2 (Hack, Spanish)                                                                                                                                    | nes_smb2                | 2017        | Wave                                                            | Miscellaneous                  |                                                                                     |
-| nes_smb2                        |        | Super Mario Bros. 2 (USA) (Rev A)                                                                                                                                      |                         | 1988        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
+| nes_smb2                        |        | Super Mario Bros. 2 (USA, Rev A)                                                                                                                                       |                         | 1988        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
 | nes_smb2wq                      |        | Super Mario Bros. 2 - Wacky Quest (Hack)                                                                                                                               | nes_smb2                | 2022        | ray8                                                            | Miscellaneous                  |                                                                                     |
-| nes_smb2j                       |        | Super Mario Bros. 2 J (Japan, MMC3 Conversion)                                                                                                                         |                         | 2020        | Loopy                                                           | Miscellaneous                  |                                                                                     |
+| nes_smb2j                       |        | Super Mario Bros. 2 J (Japan, MMC3 Conversion Hack)                                                                                                                    | nes_smb2                | 2020        | Loopy                                                           | Miscellaneous                  |                                                                                     |
 | nes_smb3c                       |        | Super Mario Bros. 3 (Hack, Chinese)                                                                                                                                    | nes_smb3                | 2016        | NOKOH                                                           | Miscellaneous                  |                                                                                     |
-| nes_smb3cast                    |        | Super Mario Bros. 3 (Hack, Spanish)                                                                                                                                    | nes_smb3                | 2018        | Wave                                                            | Miscellaneous                  |                                                                                     |
-| nes_smb3                        |        | Super Mario Bros. 3 (USA) (Rev A)                                                                                                                                      |                         | 1990        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
+| nes_smb3cast                    |        | Super Mario Bros. 3 (Hack, Spanish v2.2)                                                                                                                               | nes_smb3                | 2023        | Wave                                                            | Miscellaneous                  |                                                                                     |
+| nes_smb3                        |        | Super Mario Bros. 3 (USA, Rev A)                                                                                                                                       |                         | 1988-1990   | Nintendo                                                        | Miscellaneous                  |                                                                                     |
 | nes_smb3defedi                  |        | Super Mario Bros. 3 Definitive Edition (Hack)                                                                                                                          | nes_smb3                | 2020        | ActionGamer                                                     | Miscellaneous                  |                                                                                     |
 | nes_smb3mi                      |        | Super Mario Bros. 3Mix (Hack)                                                                                                                                          | nes_smb3                | 2014        | Southbird                                                       | Miscellaneous                  |                                                                                     |
 | md_smb4md                       |        | Super Mario Bros. 4 MD (HB, v1.4.2) (Unl)                                                                                                                              |                         | 2010        | Mairtrus                                                        | Sega Megadrive                 |                                                                                     |
@@ -17294,8 +17300,8 @@ This list contains all games supported by FinalBurn Neo.
 | fds_supermarbroc                |        | Super Mario Brothers (Hack, Spanish)                                                                                                                                   | fds_supermarbro         | 2020        | Noishe                                                          | Miscellaneous                  |                                                                                     |
 | fds_supermarbro                 |        | Super Mario Brothers (Japan)                                                                                                                                           |                         | 1986        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
 | fds_supermarbro2fix             |        | Super Mario Brothers 2 (Hack, Bugs Fix)                                                                                                                                | fds_supermarbro2        | 2023        | ShaneM                                                          | Miscellaneous                  |                                                                                     |
-| fds_supermarbro2e               |        | Super Mario Brothers 2 (Japan) (DV 2)                                                                                                                                  | fds_supermarbro2        | 1986        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
 | fds_supermarbro2                |        | Super Mario Brothers 2 (Japan)                                                                                                                                         |                         | 1986        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
+| fds_supermarbro2e               |        | Super Mario Brothers 2 (Japan, DV 2)                                                                                                                                   | fds_supermarbro2        | 1986        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
 | nes_smunlimdx                   |        | Super Mario Unlimited Deluxe (GlobalHack, v2.4)                                                                                                                        |                         | 2021        | Frantik                                                         | Miscellaneous                  |                                                                                     |
 | nes_smbunldlx                   |        | Super Mario Unlimited Deluxe (Hack)                                                                                                                                    | nes_smb                 | 2020        | Frantik                                                         | Miscellaneous                  |                                                                                     |
 | nes_supermarwor                 |        | Super Mario World (Unl)                                                                                                                                                |                         | 1995        | J.Y. Company                                                    | Miscellaneous                  |                                                                                     |
@@ -17938,7 +17944,7 @@ This list contains all games supported by FinalBurn Neo.
 | tmnti                           |        | Teenage Mutant Ninja Turtles (FMV Demo)                                                                                                                                |                         | 2009        | Sergi                                                           | Neo Geo MVS                    | You must use the Universe BIOS and set region to Japan AES                          |
 | tmntia                          |        | Teenage Mutant Ninja Turtles (FMV Demo, alt)                                                                                                                           | tmnti                   | 2009        | Sergi                                                           | Neo Geo MVS                    | You must use the Universe BIOS and set region to Japan AES                          |
 | nes_tmntc                       |        | Teenage Mutant Ninja Turtles (Hack, Chinese v1.1)                                                                                                                      | nes_tmnt                | 2021        | MEZARANSU                                                       | Miscellaneous                  |                                                                                     |
-| nes_tmntcast                    |        | Teenage Mutant Ninja Turtles (Hack, Spanish v0.9)                                                                                                                      | nes_tmnt                | 2016        | Wave                                                            | Miscellaneous                  |                                                                                     |
+| nes_tmntcast                    |        | Teenage Mutant Ninja Turtles (Hack, Spanish v2.0)                                                                                                                      | nes_tmnt                | 2022        | Wave                                                            | Miscellaneous                  |                                                                                     |
 | tmnt2pj                         |        | Teenage Mutant Ninja Turtles (Japan 2 Players, version 1)                                                                                                              | tmnt                    | 1990        | Konami                                                          | GX963                          |                                                                                     |
 | tmntj                           |        | Teenage Mutant Ninja Turtles (Japan 4 Players, version 2)                                                                                                              | tmnt                    | 1990        | Konami                                                          | GX963                          |                                                                                     |
 | tmnt2po                         |        | Teenage Mutant Ninja Turtles (Oceania 2 Players, version ?)                                                                                                            | tmnt                    | 1989        | Konami                                                          | GX963                          |                                                                                     |
@@ -17965,11 +17971,11 @@ This list contains all games supported by FinalBurn Neo.
 | tmnt24pu                        |        | Teenage Mutant Ninja Turtles - Turtles in Time (4 Players ver UEA)                                                                                                     | tmnt2                   | 1991        | Konami                                                          | GX063                          |                                                                                     |
 | md_tmntru                       |        | Teenage Mutant Ninja Turtles - Vozvrashchenie Legendy (Russia) (Unl)                                                                                                   |                         | 199?        | <unknown>                                                       | Sega Megadrive                 |                                                                                     |
 | nes_tmntiiarcgamtc              |        | Teenage Mutant Ninja Turtles II - The Arcade Game (Hack, Chinese)                                                                                                      | nes_tmntiiarcgam        | 2023        | NOKOH                                                           | Miscellaneous                  |                                                                                     |
-| nes_tmntiiarcgamc               |        | Teenage Mutant Ninja Turtles II - The Arcade Game (Hack, Spanish v0.9)                                                                                                 | nes_tmntiiarcgam        | 2016        | Wave                                                            | Miscellaneous                  |                                                                                     |
+| nes_tmntiiarcgamc               |        | Teenage Mutant Ninja Turtles II - The Arcade Game (Hack, Spanish v2.0)                                                                                                 | nes_tmntiiarcgam        | 2022        | Wave                                                            | Miscellaneous                  |                                                                                     |
 | nes_tmntiiarcgamj               |        | Teenage Mutant Ninja Turtles II - The Arcade Game (Japan)                                                                                                              | nes_tmntiiarcgam        | 1990        | Konami                                                          | Miscellaneous                  |                                                                                     |
 | nes_tmntiiarcgam                |        | Teenage Mutant Ninja Turtles II - The Arcade Game (USA)                                                                                                                |                         | 1990        | Ultra Games                                                     | Miscellaneous                  |                                                                                     |
 | nes_tmntiimanpro                |        | Teenage Mutant Ninja Turtles II - The Manhattan Project (Japan)                                                                                                        | nes_tmntiii             | 1991        | Konami                                                          | Miscellaneous                  |                                                                                     |
-| nes_tmntiiic                    |        | Teenage Mutant Ninja Turtles III - The Manhattan Project (Hack, Spanish v0.91)                                                                                         | nes_tmntiii             | 2017        | Wave                                                            | Miscellaneous                  |                                                                                     |
+| nes_tmntiiic                    |        | Teenage Mutant Ninja Turtles III - The Manhattan Project (Hack, Spanish v2.3)                                                                                          | nes_tmntiii             | 2022        | Wave                                                            | Miscellaneous                  |                                                                                     |
 | nes_tmntiii                     |        | Teenage Mutant Ninja Turtles III - The Manhattan Project (USA)                                                                                                         |                         | 1992        | Konami                                                          | Miscellaneous                  |                                                                                     |
 | nes_tmnttoufig                  |        | Teenage Mutant Ninja Turtles Tournament Fighters (USA)                                                                                                                 |                         | 1994        | Konami                                                          | Miscellaneous                  |                                                                                     |
 | md_sor2tmntsr                   |        | Teenage Mutant Ninja Turtles: Shredder's Re-Revenge (GlobalHack, v1.01)                                                                                                | md_sor2                 | 2022        | savok                                                           | Sega Megadrive                 |                                                                                     |
@@ -18541,7 +18547,7 @@ This list contains all games supported by FinalBurn Neo.
 | msx_theseusk                    |        | Theseus - Iligks I (Korea) (Unl)                                                                                                                                       | msx_theseus             | 198?        | Zemina                                                          | MSX                            |                                                                                     |
 | nes_thexderc                    |        | Thexder (Hack, Spanish)                                                                                                                                                | nes_thexder             | 2019        | Wave                                                            | Miscellaneous                  |                                                                                     |
 | msx_thexder                     |        | Thexder (Japan)                                                                                                                                                        |                         | 1986        | Game Arts                                                       | MSX                            |                                                                                     |
-| nes_thexder                     |        | Thexder (Japan)                                                                                                                                                        |                         | 1985        | Square                                                          | Miscellaneous                  |                                                                                     |
+| nes_thexder                     |        | Thexder (Japan)                                                                                                                                                        |                         | 1985        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | msx_thexderb                    |        | Thexder (Japan, Alt 2)                                                                                                                                                 | msx_thexder             | 1986        | Game Arts                                                       | MSX                            |                                                                                     |
 | msx_thexdera                    |        | Thexder (Japan, Alt)                                                                                                                                                   | msx_thexder             | 1986        | Game Arts                                                       | MSX                            |                                                                                     |
 | cv_thexder                      |        | Thexder (SGM) (HB)                                                                                                                                                     |                         | 1986-2012   | Game Arts                                                       | ColecoVision                   | SGM - Published by Team Pixelboy                                                    |
@@ -18759,7 +18765,7 @@ This list contains all games supported by FinalBurn Neo.
 | md_tnnout                       |        | TNN Outdoors Bass Tournament '96 (USA)                                                                                                                                 |                         | 1996        | American Softworks                                              | Sega Megadrive                 |                                                                                     |
 | nes_totheearth                  |        | To The Earth (USA)                                                                                                                                                     |                         | 1989        | Nintendo                                                        | Miscellaneous                  |                                                                                     |
 | spec_toadrun                    |        | Toad Runner (48K)                                                                                                                                                      |                         | 1986        | Ariolasoft                                                      | ZX Spectrum                    |                                                                                     |
-| fds_tobiddai                    |        | Tobidase Daisakusen (Japan)                                                                                                                                            |                         | 1987        | Square                                                          | Miscellaneous                  |                                                                                     |
+| fds_tobiddai                    |        | Tobidase Daisakusen (Japan)                                                                                                                                            |                         | 1987        | Squaresoft                                                      | Miscellaneous                  |                                                                                     |
 | tjumpman                        | D NW   | Tobikose! Jumpman                                                                                                                                                      |                         | 1999        | Namco                                                           | Cave                           | Coin input not working?                                                             |
 | spec_tobit                      |        | Tobit (128K) (HB)                                                                                                                                                      |                         | 2023        | Rafal Miazga                                                    | ZX Spectrum                    |                                                                                     |
 | md_slimews                      |        | Todd's Adventures in Slime World (Hack, Spanish)                                                                                                                       | md_slimew               | 2019        | Wave                                                            | Sega Megadrive                 |                                                                                     |
diff --git a/src/burner/libretro/romdata.cpp b/src/burner/libretro/romdata.cpp
index 4cc21fcd3..9e0e9496b 100644
--- a/src/burner/libretro/romdata.cpp
+++ b/src/burner/libretro/romdata.cpp
@@ -647,7 +647,7 @@ void RomDataExit()
 	if (NULL != pDataRomDesc) {
 
 		for (int i = 0; i < RDI.nDescCount + 1; i++) {
-			free(pDataRomDesc[RDI.nDescCount].szName);
+			free(pDataRomDesc[i].szName);
 		}
 
 		free(pDataRomDesc);
diff --git a/src/dep/generated/driverlist.h b/src/dep/generated/driverlist.h
index 4ce2957c0..454c29651 100644
--- a/src/dep/generated/driverlist.h
+++ b/src/dep/generated/driverlist.h
@@ -3851,6 +3851,7 @@ DRV		BurnDrvCcastlesg;
 DRV		BurnDrvCcastlesp;
 DRV		BurnDrvCcastles;
 DRV		BurnSpeccryscast;
+DRV		BurnDrvfds_crystaldrag;
 DRV		BurnSpecDizzy7remake;
 DRV		BurnDrvgg_crystalw;
 DRV		BurnDrvmd_crystlpts;
@@ -6986,6 +6987,7 @@ DRV		BurnSpecGimmebright;
 DRV		BurnDrvnes_gimmickc;
 DRV		BurnDrvnes_gimmick;
 DRV		BurnDrvfds_gingaden;
+DRV		BurnDrvfds_gingadenj;
 DRV		BurnDrvGinganin;
 DRV		BurnDrvGinganina;
 DRV		BurnDrvGteikokub;
@@ -7786,8 +7788,8 @@ DRV		BurnDrvnes_hector87;
 DRV		BurnDrvsg1k_heibaiqi;
 DRV		BurnDrvmd_heitao;
 DRV		BurnDrvHeiankyo;
-DRV		BurnDrvnes_heisetenbak;
 DRV		BurnDrvnes_heisetenbakj;
+DRV		BurnDrvnes_heisetenbak;
 DRV		BurnDrvnes_heist;
 DRV		BurnDrvMSX_heist;
 DRV		BurnDrvcv_heist;
@@ -8563,8 +8565,8 @@ DRV		BurnDrvmd_pigskinf;
 DRV		BurnDrvnes_jester;
 DRV		BurnDrvnes_jesterv2;
 DRV		BurnSpecJesterquest;
-DRV		BurnDrvnes_jesus;
 DRV		BurnDrvnes_jesusj;
+DRV		BurnDrvnes_jesus;
 DRV		BurnSpecJetbikesim5;
 DRV		BurnSpecJetbikesim2;
 DRV		BurnSpecJetbikesim6;
@@ -8772,13 +8774,13 @@ DRV		BurnDrvmd_junctions;
 DRV		BurnDrvgg_junctionj;
 DRV		BurnDrvmd_junction;
 DRV		BurnDrvgg_junction;
-DRV		BurnDrvnes_junglebooktheb;
 DRV		BurnDrvgg_jungle;
 DRV		BurnDrvsms_jungle;
 DRV		BurnDrvsms_junglec;
 DRV		BurnDrvnes_junglebookthec;
 DRV		BurnDrvgg_jungleu;
 DRV		BurnDrvnes_junglebookthe;
+DRV		BurnDrvnes_junglebooktheb;
 DRV		BurnDrvJungleby;
 DRV		BurnDrvJunglehbr;
 DRV		BurnDrvJungleh;
@@ -8890,8 +8892,8 @@ DRV		BurnDrvgg_sainttal;
 DRV		BurnDrvpce_shubibi;
 DRV		BurnDrvpce_shubibi2;
 DRV		BurnDrvnes_kakefkunnojumte;
-DRV		BurnDrvfds_kalinnotsurugi;
 DRV		BurnDrvfds_kalinnotsurugij;
+DRV		BurnDrvfds_kalinnotsurugi;
 DRV		BurnDrvKamakazi3;
 DRV		BurnDrvnes_kamenoong;
 DRV		BurnDrvnes_kamennoninaka;
@@ -9090,6 +9092,7 @@ DRV		BurnSpecKingvalley;
 DRV		BurnDrvmd_kingsbty;
 DRV		BurnDrvmd_kingsbtys;
 DRV		BurnDrvMSX_kingkngt;
+DRV		BurnDrvnes_kingsknightj;
 DRV		BurnDrvMSX_kingkngtb;
 DRV		BurnDrvMSX_kingkngta;
 DRV		BurnDrvnes_kingsknight;
@@ -10800,8 +10803,8 @@ DRV		BurnDrvMslugxunity;
 DRV		BurnDrvMsisaac;
 DRV		BurnDrvmd_msonichd;
 DRV		BurnDrvpce_metlstok;
-DRV		BurnDrvnes_metalstormrr;
 DRV		BurnDrvnes_metalstorm;
+DRV		BurnDrvnes_metalstormrr;
 DRV		BurnDrvmetmqstr;
 DRV		BurnDrvMetamrpha;
 DRV		BurnDrvMetamrphe;
@@ -15033,6 +15036,8 @@ DRV		BurnDrvnes_sanriocup;
 DRV		BurnDrvnes_sanriocupj;
 DRV		BurnDrvnes_sansaranaga;
 DRV		BurnDrvnes_sansaranagaj;
+DRV		BurnDrvfds_santaclausj;
+DRV		BurnDrvfds_santaclause;
 DRV		BurnSpecSxmascaper;
 DRV		BurnDrvSantaball;
 DRV		BurnDrvpce_santatlantean;
@@ -17181,6 +17186,7 @@ DRV		BurnSpecSudokuny;
 DRV		BurnDrvnes_sugorque;
 DRV		BurnDrvnes_sugorquej;
 DRV		BurnDrvsms_suhocheo;
+DRV		BurnDrvfds_suishoudrag;
 DRV		BurnDrvMSX_suitemacabre;
 DRV		BurnDrvnes_sukebandeka3;
 DRV		BurnDrvnes_sukebandeka3j;
@@ -17459,8 +17465,8 @@ DRV		BurnDrvnes_smbtwopla;
 DRV		BurnDrvfds_supermarbroc;
 DRV		BurnDrvfds_supermarbro;
 DRV		BurnDrvfds_supermarbro2fix;
-DRV		BurnDrvfds_supermarbro2e;
 DRV		BurnDrvfds_supermarbro2;
+DRV		BurnDrvfds_supermarbro2e;
 DRV		BurnDrvnes_smunlimdx;
 DRV		BurnDrvnes_smbunldlx;
 DRV		BurnDrvnes_supermarwor;
@@ -24949,6 +24955,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvCcastlesp,			// Crystal Castles (version 3, Spanish)
 	&BurnDrvCcastles,			// Crystal Castles (version 4)
 	&BurnSpeccryscast,			// Crystal Castles Diamond Plateaus in Space (48K)
+	&BurnDrvfds_crystaldrag,	// Crystal Dragon (Hack, English)
 	&BurnSpecDizzy7remake,		// Crystal Kingdom Dizzy - Remake (128K) (HB)
 	&BurnDrvgg_crystalw,		// Crystal Warriors (Euro, USA)
 	&BurnDrvmd_crystlpts,		// Crystal's Pony Tale (Hack, Spanish)
@@ -28083,7 +28090,8 @@ static struct BurnDriver* pDriver[] = {
 	&BurnSpecGimmebright,		// Gimme Bright (48K) (HB, v2.0)
 	&BurnDrvnes_gimmickc,		// Gimmick! (Hack, Chinese)
 	&BurnDrvnes_gimmick,		// Gimmick! (Japan)
-	&BurnDrvfds_gingaden,		// Ginga Denshou - Galaxy Odyssey (Japan)
+	&BurnDrvfds_gingaden,		// Ginga Denshou - Galaxy Odyssey (Hack, English)
+	&BurnDrvfds_gingadenj,		// Ginga Denshou - Galaxy Odyssey (Japan)
 	&BurnDrvGinganin,			// Ginga Ninkyouden (set 1)
 	&BurnDrvGinganina,			// Ginga Ninkyouden (set 2)
 	&BurnDrvGteikokub,			// Gingateikoku no Gyakushu (bootleg set 1)
@@ -28884,8 +28892,8 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvsg1k_heibaiqi,		// Hei Bai Qi (Taiwan)
 	&BurnDrvmd_heitao,			// Hei Tao 2 - Super Big 2 (China) (Unl)
 	&BurnDrvHeiankyo,			// Heiankyo Alien
-	&BurnDrvnes_heisetenbak,	// Heisei Tensai Bakabon (Hack, English)
 	&BurnDrvnes_heisetenbakj,	// Heisei Tensai Bakabon (Japan)
+	&BurnDrvnes_heisetenbak,	// Heisei Tensai Bakabon ~ Genius Bakabon, The (Hack, English)
 	&BurnDrvnes_heist,			// Heist (HB)
 	&BurnDrvMSX_heist,			// Heist, The (Japan)
 	&BurnDrvcv_heist,			// Heist, The
@@ -29661,8 +29669,8 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvnes_jester,			// Jester (HB)
 	&BurnDrvnes_jesterv2,		// Jester (HB, Alt)
 	&BurnSpecJesterquest,		// Jester Quest (128K)
-	&BurnDrvnes_jesus,			// Jesus - Kyoufu no Bio Monster (Hack, English)
 	&BurnDrvnes_jesusj,			// Jesus - Kyoufu no Bio Monster (Japan)
+	&BurnDrvnes_jesus,			// Jesus: Tale of the Dreadful Bio-Monster (Hack, English)
 	&BurnSpecJetbikesim5,		// Jet Bike Simulator - Coasts Expert (48K)
 	&BurnSpecJetbikesim2,		// Jet Bike Simulator - Coasts Standard (48K)
 	&BurnSpecJetbikesim6,		// Jet Bike Simulator - Docks Expert (48K)
@@ -29870,13 +29878,13 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvgg_junctionj,		// Junction (Japan)
 	&BurnDrvmd_junction,		// Junction (Japan, USA)
 	&BurnDrvgg_junction,		// Junction (USA)
-	&BurnDrvnes_junglebooktheb,	// Jungle Book, The (Brightness fix)
 	&BurnDrvgg_jungle,			// Jungle Book, The (Euro)
 	&BurnDrvsms_jungle,			// Jungle Book, The (Euro, Brazil)
 	&BurnDrvsms_junglec,		// Jungle Book, The (Hack, Spanish v1.0)
 	&BurnDrvnes_junglebookthec,	// Jungle Book, The (Hack, Spanish)
 	&BurnDrvgg_jungleu,			// Jungle Book, The (USA)
 	&BurnDrvnes_junglebookthe,	// Jungle Book, The (USA)
+	&BurnDrvnes_junglebooktheb,	// Jungle Book, The - Brightness Fix (Hack)
 	&BurnDrvJungleby,			// Jungle Boy (bootleg)
 	&BurnDrvJunglehbr,			// Jungle Hunt (Brazil)
 	&BurnDrvJungleh,			// Jungle Hunt (US)
@@ -29988,8 +29996,8 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvpce_shubibi,		// Kaizou Choujin Shubibinman (Japan)
 	&BurnDrvpce_shubibi2,		// Kaizou Choujin Shubibinman 2 - Aratanaru Teki (Japan)
 	&BurnDrvnes_kakefkunnojumte,// Kakefu-kun no Jump Tengoku - Speed Jigoku (Japan)
-	&BurnDrvfds_kalinnotsurugi,	// Kalin no Tsurugi (Hack, English)
 	&BurnDrvfds_kalinnotsurugij,// Kalin no Tsurugi (Japan)
+	&BurnDrvfds_kalinnotsurugi,	// Kalin no Tsurugi ~ Sword of Kalin, The (Hack, English)
 	&BurnDrvKamakazi3,			// Kamakazi III (hack of 'Super Galaxians')
 	&BurnDrvnes_kamenoong,		// Kame no Ongaeshi - Urashima Densetsu (Japan)
 	&BurnDrvnes_kamennoninaka,	// Kamen no Ninja - Akakage (Japan)
@@ -30172,7 +30180,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvKog,				// King of Gladiator (bootleg of The King of Fighters '97)
 	&BurnDrvKogplus,			// King of Gladiator Plus (The King of Fighters '97 bootleg)
 	&BurnDrvnes_kingofkings,	// King of Kings (Japan)
-	&BurnDrvnes_kingkin,		// King of Kings, The (USA) (v5.0) (Unl)
+	&BurnDrvnes_kingkin,		// King of Kings, The (USA, v5.0) (Unl)
 	&BurnDrvmd_kotm,			// King of the Monsters (Euro)
 	&BurnDrvmd_kotmj,			// King of the Monsters (Japan)
 	&BurnDrvKotm,				// King of the Monsters (set 1)
@@ -30188,6 +30196,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvmd_kingsbty,		// King's Bounty - The Conqueror's Quest (Euro, USA)
 	&BurnDrvmd_kingsbtys,		// King's Bounty - The Conqueror's Quest (Hack, Spanish)
 	&BurnDrvMSX_kingkngt,		// King's Knight (Japan)
+	&BurnDrvnes_kingsknightj,	// King's Knight (Japan)
 	&BurnDrvMSX_kingkngtb,		// King's Knight (Japan, Alt 2)
 	&BurnDrvMSX_kingkngta,		// King's Knight (Japan, Alt)
 	&BurnDrvnes_kingsknight,	// King's Knight (USA)
@@ -31898,8 +31907,8 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvMsisaac,			// Metal Soldier Isaac II
 	&BurnDrvmd_msonichd,		// Metal Sonic Hyperdrive (Hack, v4.2)
 	&BurnDrvpce_metlstok,		// Metal Stoker (Japan)
-	&BurnDrvnes_metalstormrr,	// Metal Storm (Re-Release)
 	&BurnDrvnes_metalstorm,		// Metal Storm (USA)
+	&BurnDrvnes_metalstormrr,	// Metal Storm - Re-Release (Mapper 268)
 	&BurnDrvmetmqstr,			// Metamoqester (World)
 	&BurnDrvMetamrpha,			// Metamorphic Force (ver AAA)
 	&BurnDrvMetamrphe,			// Metamorphic Force (ver EAA - alternate)
@@ -36131,6 +36140,8 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvnes_sanriocupj,		// Sanrio Cup - Pon Pon Volley (Japan)
 	&BurnDrvnes_sansaranaga,	// Sansara Naga (Hack, English)
 	&BurnDrvnes_sansaranagaj,	// Sansara Naga (Japan)
+	&BurnDrvfds_santaclausj,	// Santa Claus no Takarabako (Japan)
+	&BurnDrvfds_santaclause,	// Santa Claus' Toybox (Hack, English v1.01)
 	&BurnSpecSxmascaper,		// Santa's Xmas Caper (48K)
 	&BurnDrvSantaball,			// SantaBall - Christmas Tennis Game
 	&BurnDrvpce_santatlantean,	// Santatlantean (HB)
@@ -36708,7 +36719,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvSilvmil,			// Silver Millennium
 	&BurnDrvnes_silversurfer,	// Silver Surfer (USA)
 	&BurnDrvsms_silvervalley,	// Silver Valley (HB)
-	&BurnDrvfds_silvi,			// Silviana - Ai Ippai no Little Angel (Hack, English)
+	&BurnDrvfds_silvi,			// Silviana (Hack, English)
 	&BurnDrvfds_silvij,			// Silviana - Ai Ippai no Little Angel (Japan)
 	&BurnSpecsimcity,			// Sim City (48K)
 	&BurnDrvnes_simcity,		// Sim City (Prototype)
@@ -38279,6 +38290,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvnes_sugorque,		// Sugoro Quest - Dice no Senshitachi (Hack, English)
 	&BurnDrvnes_sugorquej,		// Sugoro Quest - Dice no Senshitachi (Japan)
 	&BurnDrvsms_suhocheo,		// Suho Jeonsa (Korea)
+	&BurnDrvfds_suishoudrag,	// Suishou no Dragon (Japan)
 	&BurnDrvMSX_suitemacabre,	// Suite Macabre (HB)
 	&BurnDrvnes_sukebandeka3,	// Sukeban Deka 3 (Hack, English)
 	&BurnDrvnes_sukebandeka3j,	// Sukeban Deka 3 (Japan)
@@ -38537,12 +38549,12 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvnes_smb,			// Super Mario Bros. (World)
 	&BurnDrvmd_smbbc,			// Super Mario Bros. + Battle City (Russia) (Unl)
 	&BurnDrvnes_smb2c,			// Super Mario Bros. 2 (Hack, Spanish)
-	&BurnDrvnes_smb2,			// Super Mario Bros. 2 (USA) (Rev A)
+	&BurnDrvnes_smb2,			// Super Mario Bros. 2 (USA, Rev A)
 	&BurnDrvnes_smb2wq,			// Super Mario Bros. 2 - Wacky Quest (Hack)
-	&BurnDrvnes_smb2j,			// Super Mario Bros. 2 J (Japan, MMC3 Conversion)
+	&BurnDrvnes_smb2j,			// Super Mario Bros. 2 J (Japan, MMC3 Conversion Hack)
 	&BurnDrvnes_smb3c,			// Super Mario Bros. 3 (Hack, Chinese)
-	&BurnDrvnes_smb3cast,		// Super Mario Bros. 3 (Hack, Spanish)
-	&BurnDrvnes_smb3,			// Super Mario Bros. 3 (USA) (Rev A)
+	&BurnDrvnes_smb3cast,		// Super Mario Bros. 3 (Hack, Spanish v2.2)
+	&BurnDrvnes_smb3,			// Super Mario Bros. 3 (USA, Rev A)
 	&BurnDrvnes_smb3defedi,		// Super Mario Bros. 3 Definitive Edition (Hack)
 	&BurnDrvnes_smb3mi,			// Super Mario Bros. 3Mix (Hack)
 	&BurnDrvmd_smb4md,			// Super Mario Bros. 4 MD (HB, v1.4.2) (Unl)
@@ -38557,8 +38569,8 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvfds_supermarbroc,	// Super Mario Brothers (Hack, Spanish)
 	&BurnDrvfds_supermarbro,	// Super Mario Brothers (Japan)
 	&BurnDrvfds_supermarbro2fix,// Super Mario Brothers 2 (Hack, Bugs Fix)
-	&BurnDrvfds_supermarbro2e,	// Super Mario Brothers 2 (Japan) (DV 2)
 	&BurnDrvfds_supermarbro2,	// Super Mario Brothers 2 (Japan)
+	&BurnDrvfds_supermarbro2e,	// Super Mario Brothers 2 (Japan, DV 2)
 	&BurnDrvnes_smunlimdx,		// Super Mario Unlimited Deluxe (GlobalHack, v2.4)
 	&BurnDrvnes_smbunldlx,		// Super Mario Unlimited Deluxe (Hack)
 	&BurnDrvnes_supermarwor,	// Super Mario World (Unl)
@@ -39205,7 +39217,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvTmnti,				// Teenage Mutant Ninja Turtles (FMV Demo)
 	&BurnDrvTmntia,				// Teenage Mutant Ninja Turtles (FMV Demo, alt)
 	&BurnDrvnes_tmntc,			// Teenage Mutant Ninja Turtles (Hack, Chinese v1.1)
-	&BurnDrvnes_tmntcast,		// Teenage Mutant Ninja Turtles (Hack, Spanish v0.9)
+	&BurnDrvnes_tmntcast,		// Teenage Mutant Ninja Turtles (Hack, Spanish v2.0)
 	&BurnDrvTmht2pj,			// Teenage Mutant Ninja Turtles (Japan 2 Players, version 1)
 	&BurnDrvTmntj,				// Teenage Mutant Ninja Turtles (Japan 4 Players, version 2)
 	&BurnDrvTmht2po,			// Teenage Mutant Ninja Turtles (Oceania 2 Players, version ?)
@@ -39232,11 +39244,11 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvTmnt24pu,			// Teenage Mutant Ninja Turtles - Turtles in Time (4 Players ver UEA)
 	&BurnDrvmd_tmntru,			// Teenage Mutant Ninja Turtles - Vozvrashchenie Legendy (Russia) (Unl)
 	&BurnDrvnes_tmntiiarcgamtc,	// Teenage Mutant Ninja Turtles II - The Arcade Game (Hack, Chinese)
-	&BurnDrvnes_tmntiiarcgamc,	// Teenage Mutant Ninja Turtles II - The Arcade Game (Hack, Spanish v0.9)
+	&BurnDrvnes_tmntiiarcgamc,	// Teenage Mutant Ninja Turtles II - The Arcade Game (Hack, Spanish v2.0)
 	&BurnDrvnes_tmntiiarcgamj,	// Teenage Mutant Ninja Turtles II - The Arcade Game (Japan)
 	&BurnDrvnes_tmntiiarcgam,	// Teenage Mutant Ninja Turtles II - The Arcade Game (USA)
 	&BurnDrvnes_tmntiimanpro,	// Teenage Mutant Ninja Turtles II - The Manhattan Project (Japan)
-	&BurnDrvnes_tmntiiic,		// Teenage Mutant Ninja Turtles III - The Manhattan Project (Hack, Spanish v0.91)
+	&BurnDrvnes_tmntiiic,		// Teenage Mutant Ninja Turtles III - The Manhattan Project (Hack, Spanish v2.3)
 	&BurnDrvnes_tmntiii,		// Teenage Mutant Ninja Turtles III - The Manhattan Project (USA)
 	&BurnDrvnes_tmnttoufig,		// Teenage Mutant Ninja Turtles Tournament Fighters (USA)
 	&BurnDrvmd_sor2tmntsr,		// Teenage Mutant Ninja Turtles: Shredder's Re-Revenge (GlobalHack, v1.01)
@@ -46017,6 +46029,7 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "ccastlesp", "pre90s/d_ccastles.cpp"},
 	{ "ccastles", "pre90s/d_ccastles.cpp"},
 	{ "spec_cryscast", "spectrum/d_spectrum.cpp"},
+	{ "fds_crystaldrag", "nes/d_nes.cpp"},
 	{ "spec_dizzy7remake", "spectrum/d_spectrum.cpp"},
 	{ "gg_crystalw", "sms/d_sms.cpp"},
 	{ "md_crystlpts", "megadrive/d_megadrive.cpp"},
@@ -49124,6 +49137,7 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "nes_gimmickc", "nes/d_nes.cpp"},
 	{ "nes_gimmick", "nes/d_nes.cpp"},
 	{ "fds_gingaden", "nes/d_nes.cpp"},
+	{ "fds_gingadenj", "nes/d_nes.cpp"},
 	{ "ginganin", "pre90s/d_ginganin.cpp"},
 	{ "ginganina", "pre90s/d_ginganin.cpp"},
 	{ "gteikokub", "galaxian/d_galaxian.cpp"},
@@ -49920,8 +49934,8 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "sg1k_heibaiqi", "sg1000/d_sg1000.cpp"},
 	{ "md_heitao", "megadrive/d_megadrive.cpp"},
 	{ "heiankyo", "pre90s/d_vicdual.cpp"},
-	{ "nes_heisetenbak", "nes/d_nes.cpp"},
 	{ "nes_heisetenbakj", "nes/d_nes.cpp"},
+	{ "nes_heisetenbak", "nes/d_nes.cpp"},
 	{ "nes_heist", "nes/d_nes.cpp"},
 	{ "msx_heist", "msx/d_msx.cpp"},
 	{ "cv_heist", "coleco/d_coleco.cpp"},
@@ -50689,8 +50703,8 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "nes_jester", "nes/d_nes.cpp"},
 	{ "nes_jesterv2", "nes/d_nes.cpp"},
 	{ "spec_jesterquest", "spectrum/d_spectrum.cpp"},
-	{ "nes_jesus", "nes/d_nes.cpp"},
 	{ "nes_jesusj", "nes/d_nes.cpp"},
+	{ "nes_jesus", "nes/d_nes.cpp"},
 	{ "spec_jetbikesim5", "spectrum/d_spectrum.cpp"},
 	{ "spec_jetbikesim2", "spectrum/d_spectrum.cpp"},
 	{ "spec_jetbikesim6", "spectrum/d_spectrum.cpp"},
@@ -50892,13 +50906,13 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "gg_junctionj", "sms/d_sms.cpp"},
 	{ "md_junction", "megadrive/d_megadrive.cpp"},
 	{ "gg_junction", "sms/d_sms.cpp"},
-	{ "nes_junglebooktheb", "nes/d_nes.cpp"},
 	{ "gg_jungle", "sms/d_sms.cpp"},
 	{ "sms_jungle", "sms/d_sms.cpp"},
 	{ "sms_junglec", "sms/d_sms.cpp"},
 	{ "nes_junglebookthec", "nes/d_nes.cpp"},
 	{ "gg_jungleu", "sms/d_sms.cpp"},
 	{ "nes_junglebookthe", "nes/d_nes.cpp"},
+	{ "nes_junglebooktheb", "nes/d_nes.cpp"},
 	{ "jungleby", "taito/d_taitosj.cpp"},
 	{ "junglehbr", "taito/d_taitosj.cpp"},
 	{ "jungleh", "taito/d_taitosj.cpp"},
@@ -51010,8 +51024,8 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "pce_shubibi", "pce/d_pce.cpp"},
 	{ "pce_shubibi2", "pce/d_pce.cpp"},
 	{ "nes_kakefkunnojumte", "nes/d_nes.cpp"},
-	{ "fds_kalinnotsurugi", "nes/d_nes.cpp"},
 	{ "fds_kalinnotsurugij", "nes/d_nes.cpp"},
+	{ "fds_kalinnotsurugi", "nes/d_nes.cpp"},
 	{ "kamakazi3", "galaxian/d_galaxian.cpp"},
 	{ "nes_kamenoong", "nes/d_nes.cpp"},
 	{ "nes_kamennoninaka", "nes/d_nes.cpp"},
@@ -51206,6 +51220,7 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "md_kingsbty", "megadrive/d_megadrive.cpp"},
 	{ "md_kingsbtys", "megadrive/d_megadrive.cpp"},
 	{ "msx_kingkngt", "msx/d_msx.cpp"},
+	{ "nes_kingsknightj", "nes/d_nes.cpp"},
 	{ "msx_kingkngtb", "msx/d_msx.cpp"},
 	{ "msx_kingkngta", "msx/d_msx.cpp"},
 	{ "nes_kingsknight", "nes/d_nes.cpp"},
@@ -52902,8 +52917,8 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "msisaac", "taito/d_msisaac.cpp"},
 	{ "md_msonichd", "megadrive/d_megadrive.cpp"},
 	{ "pce_metlstok", "pce/d_pce.cpp"},
-	{ "nes_metalstormrr", "nes/d_nes.cpp"},
 	{ "nes_metalstorm", "nes/d_nes.cpp"},
+	{ "nes_metalstormrr", "nes/d_nes.cpp"},
 	{ "metmqstr", "cave/d_metmqstr.cpp"},
 	{ "metamrpha", "konami/d_mystwarr.cpp"},
 	{ "metamrphe", "konami/d_mystwarr.cpp"},
@@ -57097,6 +57112,8 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "nes_sanriocupj", "nes/d_nes.cpp"},
 	{ "nes_sansaranaga", "nes/d_nes.cpp"},
 	{ "nes_sansaranagaj", "nes/d_nes.cpp"},
+	{ "fds_santaclausj", "nes/d_nes.cpp"},
+	{ "fds_santaclause", "nes/d_nes.cpp"},
 	{ "spec_sxmascaper", "spectrum/d_spectrum.cpp"},
 	{ "santaball", "neogeo/d_neogeo.cpp"},
 	{ "pce_santatlantean", "pce/d_pce.cpp"},
@@ -59221,6 +59238,7 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "nes_sugorque", "nes/d_nes.cpp"},
 	{ "nes_sugorquej", "nes/d_nes.cpp"},
 	{ "sms_suhocheo", "sms/d_sms.cpp"},
+	{ "fds_suishoudrag", "nes/d_nes.cpp"},
 	{ "msx_suitemacabre", "msx/d_msx.cpp"},
 	{ "nes_sukebandeka3", "nes/d_nes.cpp"},
 	{ "nes_sukebandeka3j", "nes/d_nes.cpp"},
@@ -59491,8 +59509,8 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "fds_supermarbroc", "nes/d_nes.cpp"},
 	{ "fds_supermarbro", "nes/d_nes.cpp"},
 	{ "fds_supermarbro2fix", "nes/d_nes.cpp"},
-	{ "fds_supermarbro2e", "nes/d_nes.cpp"},
 	{ "fds_supermarbro2", "nes/d_nes.cpp"},
+	{ "fds_supermarbro2e", "nes/d_nes.cpp"},
 	{ "nes_smunlimdx", "nes/d_nes.cpp"},
 	{ "nes_smbunldlx", "nes/d_nes.cpp"},
 	{ "nes_supermarwor", "nes/d_nes.cpp"},