diff --git a/hash/a2600.xml b/hash/a2600.xml
index 3c0e4c062e3..4ec0c608017 100644
--- a/hash/a2600.xml
+++ b/hash/a2600.xml
@@ -6687,7 +6687,7 @@ Info from Atariage and Atarimania
 		</part>
 	</software>
 
-	<software name="ghostb">
+	<software name="ghostbst">
 		<description>Ghostbusters</description>
 		<year>1985</year>
 		<publisher>Activision</publisher>
@@ -6699,7 +6699,7 @@ Info from Atariage and Atarimania
 		</part>
 	</software>
 
-	<software name="ghostbe" cloneof="ghostb">
+	<software name="ghostbste" cloneof="ghostbst">
 		<description>Ghostbusters (PAL)</description>
 		<year>1985</year>
 		<publisher>Activision</publisher>
@@ -6711,7 +6711,7 @@ Info from Atariage and Atarimania
 		</part>
 	</software>
 
-	<software name="ghostb2">
+	<software name="ghostbs2">
 		<description>Ghostbusters II (PAL)</description>
 		<year>1992</year>
 		<publisher>Salu</publisher>
@@ -6723,7 +6723,7 @@ Info from Atariage and Atarimania
 		</part>
 	</software>
 
-	<software name="ghostb2a" cloneof="ghostb2">
+	<software name="ghostbs2a" cloneof="ghostbs2">
 		<description>Ghostbusters II (PAL) (Alt Tune)</description>
 		<year>1992</year>
 		<publisher>Salu</publisher>
diff --git a/hash/c64_cart.xml b/hash/c64_cart.xml
index 04789235e98..2edc3f0cd8a 100644
--- a/hash/c64_cart.xml
+++ b/hash/c64_cart.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <softwarelist name="c64_cart" description="Commodore 64 cartridges">
 
@@ -4303,7 +4303,7 @@
 		</part>
 	</software>
 
-	<software name="ghostb">
+	<software name="ghostbst">
 		<description>Ghostbusters</description>
 		<year>1984</year>
 		<publisher>Activision</publisher>
diff --git a/hash/einstein.xml b/hash/einstein.xml
index 01f60b5a697..a4f9832304f 100644
--- a/hash/einstein.xml
+++ b/hash/einstein.xml
@@ -603,7 +603,7 @@ Xtal Systems (Xtal Research)
 		</part>
 	</software>
 
-	<software name="fligtsim">
+	<software name="fsim">
 		<description>Flight Simulation</description>
 		<year>1985</year>
 		<publisher>ScreenSoft</publisher>
@@ -692,7 +692,7 @@ Xtal Systems (Xtal Research)
 		</part>
 	</software>
 
-	<software name="jswilly">
+	<software name="jetsetw">
 		<description>Jet Set Willy</description>
 		<year>19??</year>
 		<publisher>Software Projects</publisher>
diff --git a/hash/fm7_cass.xml b/hash/fm7_cass.xml
index 193bb8dad08..aeb80e5e1a3 100644
--- a/hash/fm7_cass.xml
+++ b/hash/fm7_cass.xml
@@ -631,7 +631,7 @@ Titles, serial #s, publishers and release dates taken from:
 		</part>
 	</software>
 
-	<software name="flighsim">
+	<software name="fsim">
 		<description>Flight Simulator</description>
 		<year>1983</year>
 		<publisher>キャリーラボ (Carry Lab)</publisher>
diff --git a/hash/megadriv.xml b/hash/megadriv.xml
index e8fa4bb7334..7ac324dbff8 100644
--- a/hash/megadriv.xml
+++ b/hash/megadriv.xml
@@ -3413,7 +3413,7 @@ Info on Sega chip labels (from Sunbeam / Digital Corruption)
 
 
 <!-- Only Euro is confirmed -->
-	<software name="krusty">
+	<software name="krustyfh">
 		<description>Krusty's Super Fun House (Euro, USA, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Flying Edge</publisher>
@@ -3428,7 +3428,7 @@ Info on Sega chip labels (from Sunbeam / Digital Corruption)
 
 
 <!-- Only USA is confirmed -->
-	<software name="krusty1" cloneof="krusty">
+	<software name="krustyfh1" cloneof="krustyfh">
 		<description>Krusty's Super Fun House (Euro, USA)</description>
 		<year>1992</year>
 		<publisher>Flying Edge</publisher>
@@ -28670,8 +28670,9 @@ Notice that these are not working on real hardware due to bugged code with VDP i
 
 <!-- dumps which need ad hoc handlers to be installed in the emulator -->
 
+<!-- This cart is missing the higher bank containing Dragon Ball game -->
 	<software name="12in1">
-		<description>12 in 1</description>
+		<description>12 in 1 (Incomplete Dump)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="megadriv_cart">
@@ -28682,7 +28683,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i
 		</part>
 	</software>
 
-	<software name="4in1pb">
+	<software name="4in1">
 		<description>4 in 1 (Pirate)</description>
 		<year>199?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -28960,7 +28961,7 @@ Notice that these are not working on real hardware due to bugged code with VDP i
 		</part>
 	</software>
 
-	<software name="s19in1">
+	<software name="s19in1" supported="partial">
 		<description>Super 19 in 1 (Pirate)</description>
 		<year>199?</year>
 		<publisher>&lt;unknown&gt;</publisher>
diff --git a/hash/msx1_cart.xml b/hash/msx1_cart.xml
index 3d47e8dc6e3..9ec2b151d04 100644
--- a/hash/msx1_cart.xml
+++ b/hash/msx1_cart.xml
@@ -536,7 +536,7 @@ Xyzolog - Electric Software
 		</part>
 	</software>
 
-	<software name="flighsim">
+	<software name="fsim">
 		<description>Flight Simulator - Gyorai Kougeki (Jpn)</description>
 		<year>1988</year>
 		<publisher>subLOGIC</publisher>
@@ -6887,7 +6887,7 @@ kept for now until finding out what those bytes affect...
 	</software>
 
 <!-- Title screen differs from the one depicted at http://www.generation-msx.nl/msxdb/softwareinfo/497 -->
-	<software name="jetset">
+	<software name="jetsetw">
 		<description>Jet Set Willy (Jpn)</description>
 		<year>1985</year>
 		<publisher>Hudson Soft</publisher>
@@ -6900,7 +6900,7 @@ kept for now until finding out what those bytes affect...
 		</part>
 	</software>
 
-	<software name="jetseta" cloneof="jetset">
+	<software name="jetsetwa" cloneof="jetsetw">
 		<description>Jet Set Willy (Jpn, Alt)</description>
 		<year>1985</year>
 		<publisher>Hudson Soft</publisher>
diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml
index 13c7c0a0a40..7f8b8a53280 100644
--- a/hash/pc8801_flop.xml
+++ b/hash/pc8801_flop.xml
@@ -12350,7 +12350,7 @@ ExtractDisk  [02]"Mader Club DISK " -> "murder club_02.d88"
 		</part>
 	</software>
 
-	<software name="flighsim">
+	<software name="fsim">
 		<!-- Alt. Title: Flight Simulator with Torpedo Attack (Box) -->
 		<description>Flight Simulator with Gyorai Kogeki</description>
 		<year>1988</year>
@@ -19932,7 +19932,7 @@ ExtractDisk  [02]"LAGRANGE      " -> "lagrange l-2_02.d88"
 		</part>
 	</software>
 
-	<software name="littleco">
+	<software name="littlecp">
 		<description>Little Computer People</description>
 		<year>1987</year>
 		<publisher>ポニカ (Pony Canyon)</publisher>
diff --git a/hash/pcw.xml b/hash/pcw.xml
index 3cf611fb197..3a072ebe55a 100644
--- a/hash/pcw.xml
+++ b/hash/pcw.xml
@@ -1024,7 +1024,7 @@
 		</part>
 	</software>
 
-	<software name="hollywoo">
+	<software name="hollyhij">
 		<description>Hollywood Hijinx (UK)</description>
 		<year>1986</year>
 		<publisher>Infocom</publisher>
diff --git a/hash/sms.xml b/hash/sms.xml
index 25d142dbc49..f76b5f1cc28 100644
--- a/hash/sms.xml
+++ b/hash/sms.xml
@@ -3480,7 +3480,7 @@
 	</software>
 
 	<software name="knightm2">
-		<description>Knightmare II: The Maze of Galious (Kor)</description>
+		<description>Knightmare II - The Maze of Galious (Kor)</description>
 		<year>199?</year>
 		<publisher>Zemina?</publisher>
 		<info name="alt_title" value="마성전설 II (Maseong Jeonseol II)" />
diff --git a/hash/snes.xml b/hash/snes.xml
index 69e8f808526..db70d74c727 100644
--- a/hash/snes.xml
+++ b/hash/snes.xml
@@ -201,15 +201,15 @@ L***   : 2 ROM chips, the largest being 32Mb
 *X***  : Evaluation board with "SA1" special chip
 
 **0*   :  No SRAM chip
-**1*   : 1 SRAM chip (16Kb)
-**2*   : 1 SRAM chip (32Kb)
-**3*   : 1 SRAM chip (64Kb)
-**4*   : 1 SRAM chip (128Kb)
-**5*   : 1 SRAM chip (256Kb)
-**6*   : 1 SRAM chip (512Kb)
-**7*   : 1 SRAM chip (1Mb)
-**8*   : 1 FLASH chip (2Mb)
-**9*   : 1 FLASH chip (1Mb)
+**1*   : 1 SRAM chip (16 Kibit)
+**2*   : 1 SRAM chip (32 Kibit)
+**3*   : 1 SRAM chip (64 Kibit)
+**4*   : 1 SRAM chip (128 Kibit)
+**5*   : 1 SRAM chip (256 Kibit)
+**6*   : 1 SRAM chip (512 Kibit)
+**7*   : 1 SRAM chip (512 Kibit or 1 Mibit)
+**8*   : 1 FLASH chip (2 Mibit)
+**9*   : 1 FLASH chip (1 Mibit)
 
 ***B   : "74LS139" or "74LS157" memory address decoder chip for SRAM (often 74F139 in evaluation boards)
 ***C   : "RTC" memory address decoder chip for SRAM
@@ -274,7 +274,7 @@ Known revisions and their timeline approximaions (W.I.P):
 
 -?                 ⊆ t(F413)
 -?                 ⊆ t(F413A)
--?                 ⊆ t(F413B)
+- 1995/42,1995/42  ⊆ t(F413B)
 -->
 
 <!--
@@ -10355,7 +10355,7 @@ List of perfect retail cartridges rom dumps
 			<feature name="u3" value="U3 GSU-2" />
 			<feature name="u4" value="U4 74HCU04" />
 			<feature name="u5" value="U5 CIC" />
-			<feature name="lockout" value="" />
+			<feature name="lockout" value="F413B 9542 C" />
 			<feature name="battery" value="none" />
 			<feature name="cart_model" value="SNSP-006" />
 			<feature name="cart_back_label" value="SNSP-FAH, SNSP-NOE" />
@@ -15316,7 +15316,7 @@ List of perfect retail cartridges rom dumps
 			<feature name="u2" value="U2 512K/1M SRAM" />
 			<feature name="u3" value="U3 MAD-1" />
 			<feature name="u4" value="U4 CIC" />
-			<feature name="lockout" value="" />
+			<feature name="lockout" value="D411A 9449 CB" />
 			<feature name="battery" value="BATT CR2032" />
 			<feature name="cart_model" value="SHVC-006" />
 			<feature name="cart_back_label" value="920214" />
@@ -15324,7 +15324,7 @@ List of perfect retail cartridges rom dumps
 			<dataarea name="rom" size="524288">
 				<rom name="shvc-66-0.u1" size="524288" crc="052167cc" sha1="4b5725aeb7f770feadda6cfec5e609ff57fce363" offset="0x000000" />
 			</dataarea>
-			<dataarea name="nvram" size="131072">   <!-- The game expects 4x32kb of NVRAM to pass initial checks... Double check this! -->
+			<dataarea name="nvram" size="131072">
 			</dataarea>
 		</part>
 	</software>
@@ -21215,7 +21215,7 @@ List of perfect retail cartridges rom dumps
 			<feature name="u2" value="U2 512K/1M SRAM" />
 			<feature name="u3" value="U3 MAD-1" />
 			<feature name="u4" value="U4 CIC" />
-			<feature name="lockout" value="" />
+			<feature name="lockout" value="F411B 9543 C" />
 			<feature name="battery" value="BATT CR2032" />
 			<feature name="cart_model" value="SHVC-028" />
 			<feature name="cart_back_label" value="G736879 BSC-JPN" />
@@ -22971,7 +22971,7 @@ List of perfect retail cartridges rom dumps
 			<feature name="u2" value="U2 512K/1M SRAM" />
 			<feature name="u3" value="U3 MAD-1" />
 			<feature name="u4" value="U4 CIC" />
-			<feature name="lockout" value="" />
+			<feature name="lockout" value="F411B 9611 a" />
 			<feature name="battery" value="BATT CR2032" />
 			<feature name="cart_model" value="SHVC-040" />
 			<feature name="cart_back_label" value="G744238 BSC-JPN-1" />
diff --git a/hash/svi318_cart.xml b/hash/svi318_cart.xml
index 908a7d82ab3..a5d0e9d058a 100644
--- a/hash/svi318_cart.xml
+++ b/hash/svi318_cart.xml
@@ -3,7 +3,7 @@
 <!--
 Info Taken from here: http://www.samdal.com/SVIDOCS/SVI_Softwares_for_SVI318-328.pdf
 
-These Cartridges is not dumped:
+These Cartridges are not dumped:
 Just Write JR. SD294C
 Amoured Assault SD233C // Was availible on Cartridge and/or Tape
 
@@ -14,9 +14,9 @@ Amoured Assault SD233C // Was availible on Cartridge and/or Tape
 
 	<software name="flipper">
 		<description>Flipper Slipper</description>
-		<!--ID-No: SD291C-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD291C" />
 
 		<part name="cart" interface="svi318_cart">
 			<dataarea name="rom" size="32768">
@@ -28,9 +28,9 @@ Amoured Assault SD233C // Was availible on Cartridge and/or Tape
 
 	<software name="ffreddy">
 		<description>Frantic Freddy</description>
-		<!--ID-No: SD232C-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD232C" />
 
 		<part name="cart" interface="svi318_cart">
 			<dataarea name="rom" size="32768">
@@ -55,11 +55,11 @@ Amoured Assault SD233C // Was availible on Cartridge and/or Tape
 	</software>
 	-->
 
-	<software name="sectora">
-		<description>Sector Aplha</description>
-		<!--ID-No: SD220C-->
+	<software name="secalpha">
+		<description>Sector Alpha</description>
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD220C" />
 
 		<part name="cart" interface="svi318_cart">
 			<dataarea name="rom" size="32768">
@@ -69,11 +69,11 @@ Amoured Assault SD233C // Was availible on Cartridge and/or Tape
 
 	</software>
 
-	<software name="scrsfrce">
+	<software name="supxfrce">
 		<description>Super Cross Force</description>
-		<!--ID-No: SD237C-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD237C" />
 
 		<part name="cart" interface="svi318_cart">
 			<dataarea name="rom" size="32768">
diff --git a/hash/svi318_cass.xml b/hash/svi318_cass.xml
index b2518457307..a1ed59f7d4d 100644
--- a/hash/svi318_cass.xml
+++ b/hash/svi318_cass.xml
@@ -4,8 +4,7 @@
 Info Taken from here: http://www.samdal.com/SVIDOCS/SVI_Softwares_for_SVI318-328.pdf
                     : http://www.samdal.com/svsoftware.htm
 
-These Cassettes is not dumped:
-
+These Cassettes are not dumped:
 
 SD-253T SVjungle
 SD-238T Othello
@@ -29,9 +28,9 @@ SD-292T Ninja
 	<!--Official Software-->
 	<software name="telebuny">
 		<description>Telebunny</description>
-		<!--SD-241T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-241T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -42,9 +41,9 @@ SD-292T Ninja
 
 	<software name="sasa">
 		<description>Sasa</description>
-		<!--SD-243T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-243T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -55,9 +54,9 @@ SD-292T Ninja
 
 	<software name="kungfu">
 		<description>Kung Fu Master</description>
-		<!--SD-293T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-293T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -68,9 +67,9 @@ SD-292T Ninja
 
 	<software name="tetrahor">
 		<description>Tetra Horror</description>
-		<!--SD-216T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-216T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -81,9 +80,9 @@ SD-292T Ninja
 
 	<software name="oldmac">
 		<description>Old Mac Farmer</description>
-		<!--SD-211T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-211T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -94,9 +93,9 @@ SD-292T Ninja
 
 	<software name="turboat">
 		<description>Turboat</description>
-		<!--SD-242T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-242T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -107,9 +106,9 @@ SD-292T Ninja
 
 	<software name="spectron">
 		<description>Spectron</description>
-		<!--SD-234T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-234T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="16384">
@@ -120,9 +119,9 @@ SD-292T Ninja
 
 	<software name="armraslt">
 		<description>Armoured Assualt</description>
-		<!--SD-233T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-233T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="16384">
@@ -133,9 +132,9 @@ SD-292T Ninja
 
 	<software name="nybbltz">
 		<description>New York Bomb Blitz</description>
-		<!--SD-219T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-219T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="8042">
@@ -146,9 +145,9 @@ SD-292T Ninja
 
 	<software name="rescue">
 		<description>Rescue</description>
-		<!--SD-257T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-257T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="7303">
@@ -159,9 +158,9 @@ SD-292T Ninja
 
 	<software name="minigolf">
 		<description>Mini Golf</description>
-		<!--SD-260T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-260T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="8126">
@@ -172,9 +171,9 @@ SD-292T Ninja
 
 	<software name="junoland">
 		<description>Juno Lander</description>
-		<!--SD-260T-->
 		<year>1983</year>
 		<publisher>SIL</publisher>
+		<info name="serial" value="SD-260T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="7992">
@@ -185,9 +184,9 @@ SD-292T Ninja
 
 	<software name="sdairy">
 		<description>Spectra Dairy</description>
-		<!--SD-228T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-228T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="8554">
@@ -198,9 +197,9 @@ SD-292T Ninja
 
 	<software name="shomecon">
 		<description>Spectra Home Economist</description>
-		<!--SD-229T-->
 		<year>1983</year>
 		<publisher>Intellisoft</publisher>
+		<info name="serial" value="SD-229T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="10467">
@@ -211,9 +210,9 @@ SD-292T Ninja
 
 	<software name="srecipe">
 		<description>Spectra Recipe Management</description>
-		<!--SD-239T-->
 		<year>1983</year>
 		<publisher>Intellisoft</publisher>
+		<info name="serial" value="SD-239T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="7903">
@@ -224,9 +223,9 @@ SD-292T Ninja
 
 	<software name="filecab">
 		<description>Spectra File Cabinet</description>
-		<!--SD-225T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-225T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="11944">
@@ -237,9 +236,9 @@ SD-292T Ninja
 
 	<software name="justwrit">
 		<description>Just Write JR</description>
-		<!--SD-294C Should be a cartridge but a Tape dump exist-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-294C Should be a cartridge but a Tape dump exist" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -250,9 +249,9 @@ SD-292T Ninja
 
 	<software name="compatab">
 		<description>Compatability</description>
-		<!--SD-308T-->
 		<year>1983</year>
 		<publisher>SIL</publisher>
+		<info name="serial" value="SD-308T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="7170">
@@ -263,9 +262,9 @@ SD-292T Ninja
 
 	<software name="biorythm">
 		<description>Biorythm SVI</description>
-		<!--SD-301T-->
 		<year>1983</year>
 		<publisher>SIL</publisher>
+		<info name="serial" value="SD-301T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="8845">
@@ -276,9 +275,9 @@ SD-292T Ninja
 
 	<software name="swingman">
 		<description>Swing Man</description>
-		<!--SD-221T-->
 		<year>1983</year>
 		<publisher>Softy</publisher>
+		<info name="serial" value="SD-221T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="11919">
@@ -289,9 +288,9 @@ SD-292T Ninja
 
 	<software name="muscmntr">
 		<description>Music Mentor</description>
-		<!--SD-236T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-236T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -302,9 +301,9 @@ SD-292T Ninja
 
 	<software name="starword">
 		<description>Star Words</description>
-		<!--SD-256T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-256T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="15975">
@@ -315,9 +314,9 @@ SD-292T Ninja
 
 	<software name="nomis">
 		<description>Nomis</description>
-		<!--SD-255T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-255T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="10151">
@@ -328,9 +327,9 @@ SD-292T Ninja
 
 	<software name="firstep">
 		<description>First Steps</description>
-		<!--SD-222T-->
 		<year>1983</year>
 		<publisher>Softy</publisher>
+		<info name="serial" value="SD-222T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="19433">
@@ -341,9 +340,9 @@ SD-292T Ninja
 
 	<software name="findit">
 		<description>Findit</description>
-		<!--SD-252T-->
 		<year>1984</year>
 		<publisher>Spectravideo Israel</publisher>
+		<info name="serial" value="SD-252T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="11547">
@@ -354,9 +353,9 @@ SD-292T Ninja
 
 	<software name="muncmath">
 		<description>Munch-a-Math</description>
-		<!--SD-254T-->
 		<year>1984</year>
 		<publisher>Spectravideo Israel</publisher>
+		<info name="serial" value="SD-254T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="9399">
@@ -367,9 +366,9 @@ SD-292T Ninja
 
 	<software name="fontedit">
 		<description>Spectra Font Editor</description>
-		<!--SD-267T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-267T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="7631">
@@ -380,9 +379,9 @@ SD-292T Ninja
 
 	<software name="crunch">
 		<description>Crunch</description>
-		<!--SD-349T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-349T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="6877">
@@ -393,9 +392,9 @@ SD-292T Ninja
 
 	<software name="emrglndg">
 		<description>Emergency Landing</description>
-		<!--SD-311T-->
 		<year>1984</year>
 		<publisher>John McLachlan</publisher>
+		<info name="serial" value="SD-311T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="2764">
@@ -406,9 +405,9 @@ SD-292T Ninja
 
 	<software name="ghostrap">
 		<description>Ghostrap</description>
-		<!--SD-347T-->
 		<year>1983</year>
 		<publisher>Yoga Computing</publisher>
+		<info name="serial" value="SD-347T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="8857">
@@ -419,9 +418,9 @@ SD-292T Ninja
 
 	<software name="grphmstr">
 		<description>Graph Master</description>
-		<!--SD-617T not sure if it is the same one as it boots it says graph master 2-->
 		<year>1983</year>
 		<publisher>Yoga Computing</publisher>
+		<info name="serial" value="SD-617T not sure if it is the same one as it boots it says graph master 2" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="11049">
@@ -432,9 +431,9 @@ SD-292T Ninja
 
 	<software name="grvdggr">
 		<description>Grave Digger</description>
-		<!--SD-333T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-333T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="6658">
@@ -445,9 +444,9 @@ SD-292T Ninja
 
 	<software name="hrsrcr">
 		<description>Horse Race</description>
-		<!--SD-326T-->
 		<year>1983</year>
 		<publisher>SIL</publisher>
+		<info name="serial" value="SD-326T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="6417">
@@ -458,9 +457,9 @@ SD-292T Ninja
 
 	<software name="jmpgjck">
 		<description>Jumping Jack</description>
-		<!--SD-348T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-348T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="9228">
@@ -471,9 +470,9 @@ SD-292T Ninja
 
 	<software name="jngljim">
 		<description>Jungle Jim</description>
-		<!--SD-663T-->
 		<year>1984</year>
 		<publisher>TM Software</publisher>
+		<info name="serial" value="SD-663T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="23763">
@@ -484,9 +483,9 @@ SD-292T Ninja
 
 	<software name="kllrcar">
 		<description>Killer Car</description>
-		<!--SD-663T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-663T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="9709">
@@ -497,9 +496,9 @@ SD-292T Ninja
 
 	<software name="kiwictry">
 		<description>Kiwi Country - South Island</description>
-		<!--SD-343T-->
 		<year>1984</year>
 		<publisher>Waitaki Software</publisher>
+		<info name="serial" value="SD-343T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="10756">
@@ -510,9 +509,9 @@ SD-292T Ninja
 
 	<software name="logit">
 		<description>Logit</description>
-		<!--SD-342T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-342T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="7332">
@@ -523,9 +522,9 @@ SD-292T Ninja
 
 	<software name="mmrytrnr">
 		<description>Memory Trainer</description>
-		<!--SD-315T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-315T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="1946">
@@ -536,9 +535,9 @@ SD-292T Ninja
 
 	<software name="moonlndr">
 		<description>Moon Lander</description>
-		<!--SD-314T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-314T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="4576">
@@ -549,9 +548,9 @@ SD-292T Ninja
 
 	<software name="mscmpsr">
 		<description>Music Composer</description>
-		<!--SD-316T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-316T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="1902">
@@ -562,9 +561,9 @@ SD-292T Ninja
 
 	<software name="parajump">
 		<description>Para-Jump</description>
-		<!--SD-669T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-669T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="6016">
@@ -575,9 +574,9 @@ SD-292T Ninja
 
 	<software name="plntptrl">
 		<description>Planet Patrol</description>
-		<!--SD-669T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-669T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="17124">
@@ -588,9 +587,9 @@ SD-292T Ninja
 
 	<software name="roulette">
 		<description>Roulette</description>
-		<!--SD-669T-->
 		<year>1985</year>
 		<publisher>Intersoft</publisher>
+		<info name="serial" value="SD-669T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="20450">
@@ -601,9 +600,9 @@ SD-292T Ninja
 
 	<software name="spctrbrk">
 		<description>Spectra Break</description>
-		<!--SD-???T-->
 		<year>1983</year>
 		<publisher>SIL</publisher>
+		<info name="serial" value="SD-???T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="6266">
@@ -614,9 +613,9 @@ SD-292T Ninja
 
 	<software name="cryptcub">
 		<description>Spectra Cryptic Cube</description>
-		<!--SD-245T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-245T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="6823">
@@ -627,9 +626,9 @@ SD-292T Ninja
 
 	<software name="trader">
 		<description>Spectra Trader</description>
-		<!--SD-245T-->
 		<year>1984</year>
 		<publisher>A.C. Hunt</publisher>
+		<info name="serial" value="SD-245T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="10420">
@@ -640,9 +639,9 @@ SD-292T Ninja
 
 	<software name="spctrmnd">
 		<description>Spectramind</description>
-		<!--SD-245T-->
 		<year>1984</year>
 		<publisher>C.A.E.</publisher>
+		<info name="serial" value="SD-245T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="3027">
@@ -653,9 +652,9 @@ SD-292T Ninja
 
 	<software name="adresbok">
 		<description>Address Book</description>
-		<!--SD-269T-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-269T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="10828">
@@ -666,9 +665,9 @@ SD-292T Ninja
 
 	<software name="treasure">
 		<description>Treasure Chest</description>
-		<!--SD-323T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-323T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="2860">
@@ -679,9 +678,9 @@ SD-292T Ninja
 
 	<software name="unclealb">
 		<description>Uncle Albert</description>
-		<!--SD-341T-->
 		<year>1984</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-341T" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="4164">
@@ -693,9 +692,9 @@ SD-292T Ninja
 	<!-- Released as a cartridge but exist as a tape image too-->
 	<software name="flipper">
 		<description>Flipper Slipper</description>
-		<!--SD-291C-->
 		<year>1984</year>
 		<publisher>John McLachlan</publisher>
+		<info name="serial" value="SD-291C" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -706,9 +705,9 @@ SD-292T Ninja
 
 	<software name="frntfrdd">
 		<description>Frantic Freddy</description>
-		<!--SD-232C-->
 		<year>1984</year>
 		<publisher>John McLachlan</publisher>
+		<info name="serial" value="SD-232C" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="16700">
@@ -719,9 +718,9 @@ SD-292T Ninja
 
 	<software name="sectrlph">
 		<description>Sector Alpha</description>
-		<!--SD-220C-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-220C" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -732,9 +731,9 @@ SD-292T Ninja
 
 	<software name="scrsfrce">
 		<description>Super Cross Force</description>
-		<!--SD-220C-->
 		<year>1983</year>
 		<publisher>Spectravideo</publisher>
+		<info name="serial" value="SD-220C" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="32768">
@@ -759,9 +758,9 @@ SD-292T Ninja
 
 	<software name="dialuis2">
 		<description>Diamond Luis Editor</description>
-		<!--Diamond Luis II-->
 		<year>1986</year>
 		<publisher>Ikesoft</publisher>
+		<info name="serial" value="Diamond Luis II" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33546">
@@ -906,9 +905,9 @@ SD-292T Ninja
 
 	<software name="cpk">
 		<description>Cabbage Patch Kids</description>
-		<!--RC 716-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 716" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33158">
@@ -921,9 +920,9 @@ SD-292T Ninja
 
 	<software name="circusc">
 		<description>Circus Charlie</description>
-		<!--RC 712-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 712" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33156">
@@ -934,9 +933,9 @@ SD-292T Ninja
 
 	<software name="comicbak">
 		<description>Comic Bakery</description>
-		<!--RC 714-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 714" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -947,9 +946,9 @@ SD-292T Ninja
 
 	<software name="hyperol">
 		<description>Hyper Olympic 1</description>
-		<!--RC 710-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 710" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -960,9 +959,9 @@ SD-292T Ninja
 
 	<software name="trackfld">
 		<description>Track and Field 1</description>
-		<!--RC 710-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 710" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33161">
@@ -973,9 +972,9 @@ SD-292T Ninja
 
 	<software name="hyperol2">
 		<description>Hyper Olympic 2</description>
-		<!--RC 711-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 711" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33157">
@@ -986,9 +985,9 @@ SD-292T Ninja
 
 	<software name="hprrlly">
 		<description>Hyper Rally</description>
-		<!--RC 718-->
 		<year>1985</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 718" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -999,9 +998,9 @@ SD-292T Ninja
 
 	<software name="hyperspt">
 		<description>Hyper Sports 1</description>
-		<!--RC 715-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 715" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33156">
@@ -1012,9 +1011,9 @@ SD-292T Ninja
 
 	<software name="hypersp2">
 		<description>Hyper Sports 2</description>
-		<!--RC 717-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 717" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33156">
@@ -1023,11 +1022,11 @@ SD-292T Ninja
 		</part>
 	</software>
 
-	<software name="knghtmre">
+	<software name="knightmr">
 		<description>Knightmare</description>
-		<!--RC 717-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 717" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="53248">
@@ -1038,9 +1037,9 @@ SD-292T Ninja
 
 	<software name="baseball">
 		<description>Konami's Baseball</description>
-		<!--RC 724-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 724" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -1051,9 +1050,9 @@ SD-292T Ninja
 
 	<software name="boxing">
 		<description>Konami's Boxing</description>
-		<!--RC 736-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 736" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="53248">
@@ -1064,9 +1063,9 @@ SD-292T Ninja
 
 	<software name="pingpong">
 		<description>Konami's Ping Pong</description>
-		<!--RC 724-->
 		<year>1985</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 724" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -1077,9 +1076,9 @@ SD-292T Ninja
 
 	<software name="soccer">
 		<description>Konami's Soccer</description>
-		<!--RC 732-->
 		<year>1985</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 732" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="53248">
@@ -1090,9 +1089,9 @@ SD-292T Ninja
 
 	<software name="tennis">
 		<description>Konami's Tennis</description>
-		<!--RC 720-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 720" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -1103,9 +1102,9 @@ SD-292T Ninja
 
 	<software name="mgcltree">
 		<description>Magical Tree</description>
-		<!--RC 713-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 713" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33154">
@@ -1116,9 +1115,9 @@ SD-292T Ninja
 
 	<software name="mopirngr">
 		<description>Mopi Ranger</description>
-		<!--RC 728-->
 		<year>1985</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 728" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -1129,9 +1128,9 @@ SD-292T Ninja
 
 	<software name="roadfght">
 		<description>Road Fighter</description>
-		<!--RC 730-->
 		<year>1985</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 730" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -1142,9 +1141,9 @@ SD-292T Ninja
 
 	<software name="skyjag">
 		<description>Sky Jaguar</description>
-		<!--RC 721-->
 		<year>1984</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 721" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="33150">
@@ -1155,9 +1154,9 @@ SD-292T Ninja
 
 	<software name="yiear1">
 		<description>Yie Ar Kung-Fu</description>
-		<!--RC 725-->
 		<year>1985</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 725" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="36864">
@@ -1168,9 +1167,9 @@ SD-292T Ninja
 
 	<software name="yiear2">
 		<description>Yie Ar Kung-Fu II - The Emperor Yie-Gah</description>
-		<!--RC 737-->
 		<year>1985</year>
 		<publisher>Konami</publisher>
+		<info name="serial" value="RC 737" />
 
 		<part name="cass1" interface="svi318_cass">
 			<dataarea name="cass" size="53248">
diff --git a/hash/svmu.xml b/hash/svmu.xml
index 86f59696c1a..57342f20a13 100644
--- a/hash/svmu.xml
+++ b/hash/svmu.xml
@@ -4,9 +4,10 @@
 <softwarelist name="svmu" description="Sega Visual Memory Unit quickloads">
 
 	<software name="chaoadv1">
-		<description>Chao Adventure (Sonic Adventure)</description>
+		<description>Chao Adventure</description>
 		<year>1999</year>
 		<publisher>Sega</publisher>
+        <info name="source" value="Sonic Adventure" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="65536">
 				<rom name="chao adventure (1999)(sega)[sonic adventure].vms" size="65536" crc="09e93592" sha1="f35738795fd1799bbffb6c3df8d4f208ccf437b5" offset="0" />
@@ -15,9 +16,10 @@
 	</software>
 
 	<software name="chaoadv2">
-		<description>Chao Adventure 2 (Sonic Adventure 2)</description>
+		<description>Chao Adventure 2</description>
 		<year>2001</year>
 		<publisher>Sega</publisher>
+        <info name="source" value="Sonic Adventure 2" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="65536">
 				<rom name="chao adventure 2 (sega)(2001)[sonic adventure 2].vms" size="65536" crc="9c464d76" sha1="4190654ed0cede2d852fbe7c7f612a4c1b4a45b3" offset="0" />
@@ -26,9 +28,10 @@
 	</software>
 
 	<software name="chaoadv2f" cloneof="chaoadv2">
-		<description>Chao Adventure 2 (France)(Sonic Adventure 2)</description>
+		<description>Chao Adventure 2 (Fra)</description>
 		<year>2001</year>
 		<publisher>Sega</publisher>
+        <info name="source" value="Sonic Adventure 2" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="65536">
 				<rom name="chao adventure 2 (2001)(sega)(fr)[sonic adventure 2].vms" size="65536" crc="20f25e00" sha1="6e57f9447fdbcf69fddbb3b7a187f7043dcd9de0" offset="0" />
@@ -36,10 +39,11 @@
 		</part>
 	</software>
 
-	<software name="linear">
-		<description>Linear Watch (Evolution 2)</description>
+	<software name="linearw">
+		<description>Linear Watch</description>
 		<year>2000</year>
 		<publisher>ESP Software</publisher>
+        <info name="source" value="Evolution 2" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="15360">
 				<rom name="linear watch (2000)(esp software)[evolution 2].vms" size="15360" crc="16b6f34c" sha1="556b7d4235c08e03e1eec0bb6527f63dc5ec78a4" offset="0" />
@@ -47,10 +51,11 @@
 		</part>
 	</software>
 
-	<software name="mvscvsc">
-		<description>Marvel VS. Capcom 2 vs. Com (Japan)(Marvel vs. Capcom 2)</description>
+	<software name="mvsc2">
+		<description>Marvel VS. Capcom 2 vs. Com (Jpn)</description>
 		<year>2000</year>
 		<publisher>Capcom</publisher>
+        <info name="source" value="Marvel vs. Capcom 2" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="32768">
 				<rom name="marvel vs. capcom 2 vs. com (2000)(capcom)(jp)[marvel vs. capcom 2].vms" size="32768" crc="3f621910" sha1="b52bed579019bec07b818c802b72277be0c4430c" offset="0" />
@@ -58,10 +63,11 @@
 		</part>
 	</software>
 
-	<software name="popnmus1">
-		<description>Pop 'n Music Vol. 1 (Japan)(Pop 'n Music)</description>
+	<software name="popnm1">
+		<description>Pop 'n Music Vol. 1 (Jpn)</description>
 		<year>1999</year>
 		<publisher>Konami</publisher>
+        <info name="source" value="Pop 'n Music" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="28672">
 				<rom name="pop 'n music vol. 1 (1999)(konami)(jp)[pop 'n music].vms" size="28672" crc="7ce75350" sha1="339ebf13c557c14851e171202d3b105dee9fce6b" offset="0" />
@@ -69,10 +75,11 @@
 		</part>
 	</software>
 
-	<software name="popnmus2">
-		<description>Pop 'n Music Vol. 2 (Japan)(Pop 'n Music)</description>
+	<software name="popnm2">
+		<description>Pop 'n Music Vol. 2 (Jpn)</description>
 		<year>2000</year>
 		<publisher>Konami</publisher>
+        <info name="source" value="Pop 'n Music" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="30720">
 				<rom name="pop 'n music vol. 2 (2000)(konami)(jp)[pop 'n music].vms" size="30720" crc="c2a1cd70" sha1="3dfbd8cf625728040676e17409b10914cb9917e7" offset="0" />
@@ -80,10 +87,11 @@
 		</part>
 	</software>
 
-	<software name="popnmus3">
-		<description>Pop 'n Music Vol. 3 (Japan)(Pop 'n Music)</description>
+	<software name="popnm3">
+		<description>Pop 'n Music Vol. 3 (Jpn)</description>
 		<year>2000</year>
 		<publisher>Konami</publisher>
+        <info name="source" value="Pop 'n Music" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="30720">
 				<rom name="pop 'n music vol. 3 (2000)(konami)(jp)[pop 'n music].vms" size="30720" crc="96fef522" sha1="56a46d89187a04d26fe20cc4b697b23eebedb96e" offset="0" />
@@ -91,21 +99,11 @@
 		</part>
 	</software>
 
-	<software name="pwrstne2">
-		<description>Power Stone 2 Mini Store (Power Stone 2)</description>
-		<year>2000</year>
-		<publisher>Capcom</publisher>
-		<part name="quik" interface="svmu_quik">
-			<dataarea name="rom" size="65536">
-				<rom name="power stone 2 mini store (2000)(capcom)(jp)[power stone 2].vms" size="65536" crc="81d456d2" sha1="6ff653848c3dc3205d72363357fc63db4cbf359c" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="pwrstone">
-		<description>Powerstone Mini (Power Stone)</description>
+	<software name="pstone">
+		<description>Powerstone Mini</description>
 		<year>1999</year>
 		<publisher>Capcom</publisher>
+        <info name="source" value="Power Stone" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="65536">
 				<rom name="powerstone mini (1999)(capcom)[power stone].vms" size="65536" crc="04d6a41f" sha1="177781ab7023de28216b33d237d2ee7e57b66205" offset="0" />
@@ -113,10 +111,23 @@
 		</part>
 	</software>
 
-	<software name="gtameric">
-		<description>Sega GT Pocket America (Sega GT)</description>
+	<software name="pstone2">
+		<description>Power Stone 2 Mini Store (Jpn)</description>
 		<year>2000</year>
-		<publisher>Sega/Wow-Ent</publisher>
+		<publisher>Capcom</publisher>
+        <info name="source" value="Power Stone 2" />
+		<part name="quik" interface="svmu_quik">
+			<dataarea name="rom" size="65536">
+				<rom name="power stone 2 mini store (2000)(capcom)(jp)[power stone 2].vms" size="65536" crc="81d456d2" sha1="6ff653848c3dc3205d72363357fc63db4cbf359c" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="gtameric">
+		<description>Sega GT Pocket America</description>
+		<year>2000</year>
+		<publisher>Sega</publisher>
+        <info name="source" value="Sega GT" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="65536">
 				<rom name="sega gt pocket america (2000)(sega - wow-ent)[sega gt].vms" size="65536" crc="20084dc1" sha1="5268f5a02bc21239fd0ea2d25b08cbc00bc83220" offset="0" />
@@ -124,10 +135,11 @@
 		</part>
 	</software>
 
-	<software name="segagt">
-		<description>Sega GT (Japan)(Sega GT)</description>
+	<software name="gt">
+		<description>Sega GT (Jpn)</description>
 		<year>2000</year>
 		<publisher>Sega</publisher>
+        <info name="source" value="Sega GT" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="65536">
 				<rom name="sega gt (2000)(sega)(jp)[sega gt].vms" size="65536" crc="9eed83ea" sha1="8ea70e846a9a42877a62a790d8329dd72fe4749f" offset="0" />
@@ -136,9 +148,10 @@
 	</software>
 
 	<software name="gteurope">
-		<description>Sega GT Pocket Europe (Sega GT)</description>
+		<description>Sega GT Pocket Europe</description>
 		<year>2000</year>
-		<publisher>Sega/Wow-Ent</publisher>
+		<publisher>Sega</publisher>
+        <info name="source" value="Sega GT" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="65536">
 				<rom name="sega gt pocket europe (2000)(sega - wow-ent)[sega gt].vms" size="65536" crc="c8490720" sha1="e82dce08ad914ff275f1cfcf64e90d4c8c00d58a" offset="0" />
@@ -147,9 +160,10 @@
 	</software>
 
 	<software name="gtjapan">
-		<description>Sega GT Pocket Japan (Sega GT)</description>
+		<description>Sega GT Pocket Japan</description>
 		<year>2000</year>
-		<publisher>Sega/Wow-Ent</publisher>
+		<publisher>Sega</publisher>
+        <info name="source" value="Sega GT" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="65536">
 				<rom name="sega gt pocket japan (2000)(sega - wow-ent)[sega gt].vms" size="65536" crc="7d4b5c34" sha1="32e0dae07dd17de9981c84de9e12b2af6677353d" offset="0" />
@@ -158,9 +172,10 @@
 	</software>
 
 	<software name="shenmue">
-		<description>Shenmue (Japan)(Shenmue)</description>
+		<description>Shenmue (Jpn)</description>
 		<year>1999</year>
 		<publisher>Sega</publisher>
+        <info name="source" value="Shenmue" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="25600">
 				<rom name="shenmue (1999)(sega)(jp)[shenmue].vms" size="25600" crc="3fcab726" sha1="ea52613cf39b965266ad32501d8caa6286de4e57" offset="0" />
@@ -169,9 +184,10 @@
 	</software>
 
 	<software name="sc31mini">
-		<description>Soul Calibur 3-1 Mini (Japan)(SoulCalibur)</description>
+		<description>Soul Calibur 3-1 Mini (Jpn)</description>
 		<year>1999</year>
 		<publisher>Namco</publisher>
+        <info name="source" value="SoulCalibur" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="50176">
 				<rom name="soul calibur 3-1 mini (1999)(namco)(jp)[soulcalibur].vms" size="50176" crc="d23dfe42" sha1="bf34e85fb481a3e920dab7517dd170c28f5c4ad5" offset="0" />
@@ -179,10 +195,11 @@
 		</part>
 	</software>
 
-	<software name="sctxtadv">
-		<description>SoulCalibur Text Adventure (Japan)(SoulCalibur)</description>
+	<software name="sctext">
+		<description>SoulCalibur Text Adventure (Jpn)</description>
 		<year>1999</year>
 		<publisher>Namco</publisher>
+        <info name="source" value="SoulCalibur" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="50688">
 				<rom name="soulcalibur text adventure (1999)(namco)(jp)[soulcalibur].vms" size="50688" crc="eedc89ee" sha1="3783708b76cdfd2a5f027c39ff45236c1244baa4" offset="0" />
@@ -190,10 +207,11 @@
 		</part>
 	</software>
 
-	<software name="sclbrvmu">
-		<description>SoulCalibur VMU Game Pack (SoulCalibur)</description>
+	<software name="scvmugp">
+		<description>SoulCalibur VMU Game Pack </description>
 		<year>1999</year>
 		<publisher>Namco</publisher>
+        <info name="source" value="SoulCalibur" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="50176">
 				<rom name="soulcalibur vmu game pack (1999)(namco)[soulcalibur].vms" size="50176" crc="6068eb49" sha1="b3d87d67b8ca59887e9680b4213239881bb4360c" offset="0" />
@@ -202,9 +220,10 @@
 	</software>
 
 	<software name="trickjr">
-		<description>TrickStyle Junior (TrickStyle)</description>
+		<description>TrickStyle Junior</description>
 		<year>1999</year>
 		<publisher>Acclaim</publisher>
+        <info name="source" value="TrickStyle" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="3584">
 				<rom name="trickstyle junior (1999)(acclaim)[trickstyle].vms" size="3584" crc="966659f9" sha1="5b46e07f30ecf53ebdfc17eb4accaf3e3d4fa92a" offset="0" />
@@ -213,7 +232,7 @@
 	</software>
 
 	<software name="vmufootb">
-		<description>VMU Football</description><!-- orginally free from dreamcast.com -->
+		<description>VMU Football (USA)</description>   <!-- orginally free from dreamcast.com -->
 		<year>1999</year>
 		<publisher>Sega</publisher>
 		<info name="release" value="19990929"/>
@@ -225,9 +244,10 @@
 	</software>
 
 	<software name="zombie">
-		<description>Zombie Revenge Training Game (Zombie Revenge)</description>
+		<description>Zombie Revenge Training Game</description>
 		<year>1999</year>
 		<publisher>Sega</publisher>
+        <info name="source" value="Zombie Revenge" />
 		<part name="quik" interface="svmu_quik">
 			<dataarea name="rom" size="56320">
 				<rom name="zombie revenge training game (1999)(sega)[zombie revenge].vms" size="56320" crc="7b4ce3c7" sha1="68b584f7c5c7ac119c12641e8b1f01a726c58881" offset="0" />
diff --git a/hash/xegs.xml b/hash/xegs.xml
index 86672bfad3a..08d0565219a 100644
--- a/hash/xegs.xml
+++ b/hash/xegs.xml
@@ -243,7 +243,7 @@ Compiled by K1W1
 		</part>
 	</software>
 
-	<software name="deflktor">
+	<software name="deflektr">
 		<description>Deflektor (Prototype)</description>
 		<year>1988</year>
 		<publisher>Atari</publisher>
@@ -278,7 +278,7 @@ Compiled by K1W1
 		</part>
 	</software>
 
-	<software name="flgtsim2" supported="partial">
+	<software name="fsim2" supported="partial">
 		<description>Flight Simulator 2</description>
 		<year>1987</year>
 		<publisher>Atari</publisher>
@@ -290,7 +290,7 @@ Compiled by K1W1
 		</part>
 	</software>
 
-	<software name="flgtsim2d" cloneof="flgtsim2">
+	<software name="fsim2d" cloneof="fsim2">
 		<description>Flight Simulator 2 (Demo Cartridge)</description>
 		<year>1987</year>
 		<publisher>Atari</publisher>