diff --git a/hash/snes.xml b/hash/snes.xml
index 62d3d7ed200..48894ad22e3 100644
--- a/hash/snes.xml
+++ b/hash/snes.xml
@@ -470,7 +470,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="aokidenp" cloneof="aokiden">
 		<!-- snescentral.com -->
-		<description>Aoki Densetsu Shoot! (Jpn, prototype)</description>
+		<description>Aoki Densetsu Shoot! (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>KSS</publisher>
 		<info name="alt_title" value="蒼き伝説シュート!" />
@@ -607,7 +607,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="batmanrnjp" cloneof="batmanrn">
 		<!-- d4s -->
-		<description>Batman Returns (Jpn, prototype)</description>
+		<description>Batman Returns (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<part name="cart" interface="snes_cart">
@@ -878,7 +878,7 @@ Beyond that last category are the roms waiting to be classified.
 	<software name="clocktowp" cloneof="clocktow">
 		<!-- nintendoplayer.com -->
 		<!-- Notes: 64Kibits of SRAM (16Kibits in retail) -->
-		<description>Clock Tower (Jpn, prototype)</description>
+		<description>Clock Tower (Japan, prototype)</description>
 		<year>1995</year>
 		<publisher>Human Entertainment</publisher>
 		<part name="cart" interface="snes_cart">
@@ -1055,7 +1055,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="dkongcuce" cloneof="dkongc">
 		<!-- snescentral.com -->
-		<description>Donkey Kong Country - Competition Cartridge (USA, Not for sale)</description>
+		<description>Donkey Kong Country - Competition Cartridge (USA, not for sale)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="DIS-SNS-8E-USA" />
@@ -1655,7 +1655,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="hebepopnjp" cloneof="hebepopn">
 		<!-- lytron -->
-		<description>Hebereke no Popoon (Jpn, prototype 19931101)</description>
+		<description>Hebereke no Popoon (Japan, prototype 19931101)</description>
 		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="37" />
@@ -1672,7 +1672,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="humangp2p" cloneof="f1polep2">
 		<!-- snescentral.com -->
-		<description>Human Grand Prix II (Jpn, prototype)</description>
+		<description>Human Grand Prix II (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="HUMAN No. 10358" />
@@ -1760,7 +1760,7 @@ Beyond that last category are the roms waiting to be classified.
 	<software name="itadaki2p" cloneof="itadaki2">
 		<!-- unknown/auction -->
 		<!-- Notes: according to build date it was compiled three days before the retail -->
-		<description>Itadaki Street 2 - Neon Sign wa Barairo ni (Jpn, prototype 19931220)</description>
+		<description>Itadaki Street 2 - Neon Sign wa Barairo ni (Japan, prototype 19931220)</description>
 		<year>1994</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-I2" />
@@ -2815,7 +2815,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="rockman7p" cloneof="megaman7">
 		<!-- lostlevels.org -->
-		<description>Rockman 7 - Shukumei no Taiketsu! (Jpn, prototype 19941111)</description>
+		<description>Rockman 7 - Shukumei no Taiketsu! (Japan, prototype 19941111)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<part name="cart" interface="snes_cart">
@@ -2920,7 +2920,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="sdf1gpp" cloneof="sdf1gp">
 		<!-- John Weidman -->
-		<description>SD F-1 Grand Prix (Jpn, prototype)</description>
+		<description>SD F-1 Grand Prix (Japan, prototype)</description>
 		<year>1995</year>
 		<publisher>Video System</publisher>
 		<part name="cart" interface="snes_cart">
@@ -3137,7 +3137,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="starfoxswc" cloneof="starwing">
 		<!-- snescentral.com -->
-		<description>Star Fox - Super Weekend (USA, Not for sale)</description>
+		<description>Star Fox - Super Weekend (USA, not for sale)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNS-FU-USA" />
@@ -3305,7 +3305,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="schinwl2p" cloneof="schinwl2">
 		<!-- lostlevels.org -->
-		<description>Super Chinese World 2 - Uchuu Ichibutou Taikai (Jpn, prototype)</description>
+		<description>Super Chinese World 2 - Uchuu Ichibutou Taikai (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Culture Brain</publisher>
 		<part name="cart" interface="snes_cart">
@@ -3364,7 +3364,7 @@ Beyond that last category are the roms waiting to be classified.
 	<software name="fireprw2p" cloneof="fireprw2">
 		<!-- snescentral.com -->
 		<!-- Notes: 99% identical to the final release -->
-		<description>Super Fire Pro Wrestling 2 (Jpn, final prototype)</description>
+		<description>Super Fire Pro Wrestling 2 (Japan, final prototype)</description>
 		<year>1992</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="HUMAN No. 138" />
@@ -3391,7 +3391,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="fireprw3p" cloneof="fireprw3">
 		<!-- snescentral.com -->
-		<description>Super Fire Pro Wrestling III - Final Bout (Jpn, prototype)</description>
+		<description>Super Fire Pro Wrestling III - Final Bout (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="HUMAN No. 10113" />
@@ -3423,7 +3423,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="sgossunp" cloneof="sgossun">
 		<!-- dizrythmia / snescentral.com -->
-		<description>Super Gussun Oyoyo (Jpn, prototype)</description>
+		<description>Super Gussun Oyoyo (Japan, prototype)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<part name="cart" interface="snes_cart">
@@ -3733,7 +3733,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="superunop" cloneof="superuno">
 		<!-- snescentral.com -->
-		<description>Super Uno (Jpn, prototype)</description>
+		<description>Super Uno (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Tomy</publisher>
 		<info name="alt_title" value="スーパーUNO" />
@@ -4247,7 +4247,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="chodorap" cloneof="mcfang">
 		<!-- Notes: this rom image was released without any documentation -->
-		<description>Chou Makai Taisen! Dorabocchan (Jpn, prototype 19921221)</description>
+		<description>Chou Makai Taisen! Dorabocchan (Japan, prototype 19921221)</description>
 		<year>1993</year>
 		<publisher>Naxat Soft</publisher>
 		<part name="cart" interface="snes_cart">
@@ -4305,7 +4305,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="darkkingp" cloneof="darkking">
 		<!-- unknown/auction -->
-		<description>Dark Kingdom (Jpn, prototype Ver. 0.55)</description>
+		<description>Dark Kingdom (Japan, prototype Ver. 0.55)</description>
 		<year>1994</year>
 		<publisher>Nihon Telenet</publisher>
 		<part name="cart" interface="snes_cart">
@@ -4332,7 +4332,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="demonblzp" cloneof="demoncrt">
 		<!-- Notes: this rom image was released without any documentation -->
-		<description>Demon's Blazon - Makaimura Monshou Hen (Jpn, prototype)</description>
+		<description>Demon's Blazon - Makaimura Monshou Hen (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<part name="cart" interface="snes_cart">
@@ -4386,7 +4386,7 @@ Beyond that last category are the roms waiting to be classified.
 	</software>
 
 	<software name="ggoemon3p" cloneof="ggoemon3">
-		<description>Ganbare Goemon 3 - Shishi Juurokubee no Karakuri Manjigatame (Jpn, prototype 19941024)</description>
+		<description>Ganbare Goemon 3 - Shishi Juurokubee no Karakuri Manjigatame (Japan, prototype 19941024)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="alt_title" value="がんばれゴエモン3 獅子重禄兵衛のからくり卍固め" />
@@ -4404,7 +4404,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="hakpro94p" cloneof="hakpro94">
 		<!-- unknown/auction -->
-		<description>Hakunetsu Pro Yakyuu '94 - Ganba League 3 (Jpn, prototype 19931119)</description>
+		<description>Hakunetsu Pro Yakyuu '94 - Ganba League 3 (Japan, prototype 19931119)</description>
 		<year>1993</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="alt_title" value="白熱プロ野球'94 ガンバリーグ3" />
@@ -4430,7 +4430,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="jellybo2">
 		<!-- Notes: there is no public information about this prototype -->
-		<description>Jelly Boy 2 (Jpn, prototype)</description>
+		<description>Jelly Boy 2 (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Game Freak</publisher> <!-- cancelled -->
 		<part name="cart" interface="snes_cart">
@@ -4446,7 +4446,7 @@ Beyond that last category are the roms waiting to be classified.
 	<software name="mazingera" cloneof="mazinger">
 		<!-- Notes: removal recommended, floating rom with a good checksum, unknown source,
 		            could be a prototype, but could also be a hack or bad dump with a fixed checksum -->
-		<description>Mazinger Z (Jpn, prototype?)</description>
+		<description>Mazinger Z (Japan, prototype?)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="alt_title" value="マジンガーZ" />
@@ -4556,7 +4556,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="oonitap" cloneof="oonita">
 		<!-- unknown/auction -->
-		<description>Oonita Atsushi FMW (Jpn, prototype)</description>
+		<description>Oonita Atsushi FMW (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Pony Canyon</publisher>
 		<part name="cart" interface="snes_cart">
@@ -4613,7 +4613,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="pikiinyap" cloneof="pikiinya">
 		<!-- unknown/auction -->
-		<description>Pikiinya! (Jpn, prototype)</description>
+		<description>Pikiinya! (Japan, prototype)</description>
 		<year>1997</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="alt_title" value="ピキーニャ!" />
@@ -4685,7 +4685,7 @@ Beyond that last category are the roms waiting to be classified.
 	</software>
 
 	<software name="raidenjp" cloneof="raiden">
-		<description>Raiden Densetsu (Jpn, prototype)</description>
+		<description>Raiden Densetsu (Japan, prototype)</description>
 		<year>1991</year>
 		<publisher>Toei Animation</publisher>
 		<info name="alt_title" value="雷電伝説" />
@@ -4755,7 +4755,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<software name="solstic2p" cloneof="equinox">
 		<!-- Notes: no source and no documentation -->
-		<description>Solstice II (Jpn, prototype 19930303)</description>
+		<description>Solstice II (Japan, prototype 19930303)</description>
 		<year>1993</year>
 		<publisher>Epic / Sony Records</publisher>
 		<part name="cart" interface="snes_cart">
@@ -4885,7 +4885,7 @@ Beyond that last category are the roms waiting to be classified.
 	<software name="wizapp" cloneof="wizap">
 		<!-- Notes: there were two versions in goodsnes differing only on two header bytes,
 		            one of them is probably hacked, the other is included but commented out until a redump is issued -->
-		<description>Wizap! - Ankoku no Ou (Jpn, prototype, hacked?)</description>
+		<description>Wizap! - Ankoku no Ou (Japan, prototype, hacked?)</description>
 		<year>1994</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="alt_title" value="ウィザップ!~暗黒の王" />
@@ -4944,7 +4944,7 @@ Beyond that last category are the roms waiting to be classified.
 	<software name="aladdi2k">
 	<!-- Protection notes: write latch byte to 88xxxx, then reads back BITSWAP8(latch,0,6,7,1,2,3,4,5) from 80xxxx -->
 		<!-- single cartridge source: d4s -->
-		<description>Aladdin 2000 (Bra, Mega Drive Bootleg)</description>
+		<description>Aladdin 2000 (Brazil, Mega Drive bootleg)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -4959,7 +4959,7 @@ Beyond that last category are the roms waiting to be classified.
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="aladdi2kh" cloneof="aladdi2k">
-		<description>Aladdin 2000 (Bra, Mega Drive Bootleg, Cracked)</description>
+		<description>Aladdin 2000 (Brazil, Mega Drive bootleg, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -4990,7 +4990,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="banpijah" cloneof="chester" supported="no">
-		<description>Bananas de Pijamas (Asia, Cracked)</description>
+		<description>Bananas de Pijamas (Asia, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5009,7 +5009,7 @@ more investigation needed...
 	<software name="bugslife" supported="no"> <!-- unemulated additional hardware -->
 		<!-- single cartridge source: d4s -->
 		<!-- Notes: highly similar to the game boy color version, this could be based on a prototype -->
-		<description>A Bug's Life (Bra)</description>
+		<description>A Bug's Life (Brazil)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5024,7 +5024,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="bugslifeh" cloneof="bugslife">
-		<description>A Bug's Life (Bra, Cracked)</description>
+		<description>A Bug's Life (Brazil, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5050,7 +5050,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="digimonh" cloneof="digimon">
-		<description>Digimon Adventure (Cracked)</description>
+		<description>Digimon Adventure (cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5089,7 +5089,7 @@ more investigation needed...
 	<software name="kof2000">
 	<!-- Protection notes: write latch byte to 88xxxx, then reads back BITSWAP8(latch,0,6,7,1,2,3,4,5) from 80xxxx -->
 		<!-- single cartridge source: d4s -->
-		<description>The King of Fighters 2000 (Bra)</description>
+		<description>The King of Fighters 2000 (Brazil)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5102,7 +5102,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="kof2000h" cloneof="kof2000">
-		<description>The King of Fighters 2000 (Bra, Cracked)</description>
+		<description>The King of Fighters 2000 (Brazil, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5129,7 +5129,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="pokemonh" cloneof="pokemon">
-		<description>Pocket Monster (Asia, Cracked)</description>
+		<description>Pocket Monster (Asia, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5155,7 +5155,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="pokegsh" cloneof="pokegs">
-		<description>Pokemon Gold Silver (Asia, Cracked)</description>
+		<description>Pokemon Gold Silver (Asia, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5182,7 +5182,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="pokestadh" cloneof="pokestad">
-		<description>Pokemon Stadium (Asia, Cracked)</description>
+		<description>Pokemon Stadium (Asia, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5212,7 +5212,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="soulbladh" cloneof="soulblad">
-		<description>Soul Blade (Asia, Cracked)</description>
+		<description>Soul Blade (Asia, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5238,7 +5238,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="souledgeh" cloneof="souledge">
-		<description>Soul Edge Vs Samurai (Asia, Cracked)</description>
+		<description>Soul Edge Vs Samurai (Asia, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5264,7 +5264,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="sfexh" cloneof="sfex">
-		<description>Street Fighter EX Plus α (Asia, Cracked)</description>
+		<description>Street Fighter EX Plus α (Asia, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5326,7 +5326,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="tekken2h" cloneof="tekken2">
-		<description>Tekken 2 (Asia, Cracked)</description>
+		<description>Tekken 2 (Asia, cracked)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5358,7 +5358,7 @@ more investigation needed...
 
 	<!-- Notes: this is temporarily included for reference, until we fix emulation of the good dump -->
 	<software name="xmensfh" cloneof="xmensf">
-		<description>X-Men vs. Street Fighter (Asia, Cracked)</description>
+		<description>X-Men vs. Street Fighter (Asia, cracked)</description>
 		<year>1996</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5468,7 +5468,7 @@ more investigation needed...
 
 <!-- The image should be 8MB, while this is only 4MB. Half of game data is missing (only games 1 & 2 are present). Redump needed! -->
 	<software name="sup5in1" supported="partial">
-		<description>Super 5 in 1 (Bad Dump)</description>
+		<description>Super 5 in 1 (bad dump)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5493,7 +5493,7 @@ more investigation needed...
 
 <!-- The image should be 8MB, while this is only 2MB. Most of game data is missing (only games 2 & 6 are present). Redump needed! -->
 	<software name="new7in1" supported="partial">
-		<description>1997 New 7 in 1 (Bad Dump)</description>
+		<description>1997 New 7 in 1 (bad dump)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5506,7 +5506,7 @@ more investigation needed...
 
 <!-- This actually uses a different bankswitch mechanism, and it uses bit6 to select HiROM access, not sure how to emulate it, yet... -->
 	<software name="sup7in1" supported="no">
-		<description>Super 7-in-1 1997 (Bad Dump)</description>
+		<description>Super 7-in-1 1997 (bad dump)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5519,7 +5519,7 @@ more investigation needed...
 
 <!-- The image should be 8MB, while this is only 4MB. Half of game data is missing (only games 2, 3, 4 & 5 are present). Redump needed! -->
 	<software name="sup9in1" supported="partial">
-		<description>8 in 1 and 10 in 1 (Bad Dump)</description>
+		<description>8 in 1 and 10 in 1 (bad dump)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5532,7 +5532,7 @@ more investigation needed...
 
 <!-- The image should be ~8MB, while this is only 1MB. Most of game data is missing. Redump needed! -->
 	<software name="sup11in1" supported="partial">
-		<description>Super 11 in 1 (Bad Dump)</description>
+		<description>Super 11 in 1 (bad dump)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5695,7 +5695,7 @@ more investigation needed...
 
 	<software name="pfest94">
 		<!-- Notes: contains corrupt data -->
-		<description>Nintendo PowerFest 94 (USA, Not for sale)</description>
+		<description>Nintendo PowerFest 94 (USA, not for sale)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5740,7 +5740,7 @@ more investigation needed...
 		Internal header is "wrong" (see 0x21 at offset 0x7fd5). The currently included
 		dump has been obtained by de-interleaving the original file, but it has to be
 		confirmed from a real cart! -->
-		<description>Pop'n TwinBee (Jpn, Sample)</description>
+		<description>Pop'n TwinBee (Japan, sample)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5752,7 +5752,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhitomi">
-		<description>SM Choukyoushi Hitomi (Jpn)</description>
+		<description>SM Choukyoushi Hitomi (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5764,7 +5764,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhitobh">
-		<description>SM Choukyoushi Hitomi - Bangai Hen (Jpn)</description>
+		<description>SM Choukyoushi Hitomi - Bangai Hen (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5776,7 +5776,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhitob2">
-		<description>SM Choukyoushi Hitomi - Bangai Hen 2 - Maki no Love Love Panic (Jpn)</description>
+		<description>SM Choukyoushi Hitomi - Bangai Hen 2 - Maki no Love Love Panic (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5788,7 +5788,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhitotv">
-		<description>SM Choukyoushi Hitomi - Test Version (Jpn)</description>
+		<description>SM Choukyoushi Hitomi - Test Version (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5800,7 +5800,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhito2">
-		<description>SM Choukyoushi Hitomi Vol. 2 (Jpn)</description>
+		<description>SM Choukyoushi Hitomi Vol. 2 (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5812,7 +5812,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhito2t">
-		<description>SM Choukyoushi Hitomi Vol. 2 - Trial Version (Jpn)</description>
+		<description>SM Choukyoushi Hitomi Vol. 2 - Trial Version (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5824,7 +5824,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhito2r">
-		<description>SM Choukyoushi Hitomi Vol. 2 Remix (Jpn)</description>
+		<description>SM Choukyoushi Hitomi Vol. 2 Remix (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5836,7 +5836,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhito3a" cloneof="smhito3">
-		<description>SM Choukyoushi Hitomi Vol. 3 (Jpn, alt)</description>
+		<description>SM Choukyoushi Hitomi Vol. 3 (Japan, alt)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5850,7 +5850,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhito3">
-		<description>SM Choukyoushi Hitomi Vol. 3 (Jpn)</description>
+		<description>SM Choukyoushi Hitomi Vol. 3 (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5864,7 +5864,7 @@ more investigation needed...
 	</software>
 
 	<software name="smhito3t">
-		<description>SM Choukyoushi Hitomi Vol. 3 - Test Version (Jpn)</description>
+		<description>SM Choukyoushi Hitomi Vol. 3 - Test Version (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -5917,7 +5917,7 @@ more investigation needed...
 	</software>
 
 	<software name="xterm2" supported="no"> <!-- unemulated additional hardware -->
-		<description>Super X-Terminator 2 Sasuke (Jpn)</description>
+		<description>Super X-Terminator 2 Sasuke (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -6181,7 +6181,7 @@ more investigation needed...
 	</software>
 
 	<software name="actraisrf" cloneof="actraisr">
-		<description>ActRaiser (Fra)</description>
+		<description>ActRaiser (France)</description>
 		<year>1991</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SNSP-AR-FRA/SFRA" />
@@ -6205,7 +6205,7 @@ more investigation needed...
 	</software>
 
 	<software name="actraisrj" cloneof="actraisr">
-		<description>ActRaiser (Jpn)</description>
+		<description>ActRaiser (Japan)</description>
 		<year>1990</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AR" />
@@ -6256,7 +6256,7 @@ more investigation needed...
 	</software>
 
 	<software name="actrais2j" cloneof="actrais2">
-		<description>ActRaiser 2 - Chinmoku e no Seisen (Jpn)</description>
+		<description>ActRaiser 2 - Chinmoku e no Seisen (Japan)</description>
 		<year>1993</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-A8" />
@@ -6658,7 +6658,7 @@ more investigation needed...
 	</software>
 
 	<software name="aressh3">
-		<description>AIII S.V. - A Ressha de Ikou 3 - Super Version (Jpn)</description>
+		<description>AIII S.V. - A Ressha de Ikou 3 - Super Version (Japan)</description>
 		<year>1995</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-ATGJ-JPN" />
@@ -6704,7 +6704,7 @@ more investigation needed...
 	</software>
 
 	<software name="airmanaga" cloneof="aerobiz">
-		<description>Air Management - Oozora ni Kakeru (Jpn)</description>
+		<description>Air Management - Oozora ni Kakeru (Japan)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AL" />
@@ -6730,7 +6730,7 @@ more investigation needed...
 	</software>
 
 	<software name="airmang2" cloneof="aerobizs">
-		<description>Air Management II - Koukuu Ou o Mezase (Jpn)</description>
+		<description>Air Management II - Koukuu Ou o Mezase (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AG" />
@@ -6756,7 +6756,7 @@ more investigation needed...
 	</software>
 
 	<software name="akumajo" cloneof="scvania4">
-		<description>Akumajou Dracula (Jpn)</description>
+		<description>Akumajou Dracula (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AD" />
@@ -6797,7 +6797,7 @@ more investigation needed...
 	</software>
 
 	<software name="aladding" cloneof="aladdin">
-		<description>Disney's Aladdin (Ger)</description>
+		<description>Disney's Aladdin (Germany)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SNSP-RJ-NOE/SFRG" />
@@ -6819,7 +6819,7 @@ more investigation needed...
 	</software>
 
 	<software name="aladdinj" cloneof="aladdin">
-		<description>Disney's Aladdin (Jpn)</description>
+		<description>Disney's Aladdin (Japan)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-RJ" />
@@ -6894,7 +6894,7 @@ more investigation needed...
 	</software>
 
 	<software name="albodyss">
-		<description>Albert Odyssey (Jpn)</description>
+		<description>Albert Odyssey (Japan)</description>
 		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-AO" />
@@ -6920,7 +6920,7 @@ more investigation needed...
 	</software>
 
 	<software name="albodys2">
-		<description>Albert Odyssey 2 - Jashin no Taidou (Jpn)</description>
+		<description>Albert Odyssey 2 - Jashin no Taidou (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-AO2J-JPN" />
@@ -6946,7 +6946,7 @@ more investigation needed...
 	</software>
 
 	<software name="alcahest">
-		<description>Alcahest (Jpn)</description>
+		<description>Alcahest (Japan)</description>
 		<year>1993</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-LX" />
@@ -7148,7 +7148,7 @@ more investigation needed...
 	</software>
 
 	<software name="aokiden">
-		<description>Aoki Densetsu Shoot! (Jpn)</description>
+		<description>Aoki Densetsu Shoot! (Japan)</description>
 		<year>1994</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-A3KJ-JPN" />
@@ -7176,7 +7176,7 @@ more investigation needed...
 	</software>
 
 	<software name="applesed">
-		<description>Appleseed - Prometheus no Shintaku (Jpn)</description>
+		<description>Appleseed - Prometheus no Shintaku (Japan)</description>
 		<year>1994</year>
 		<publisher>Visit</publisher>
 		<info name="serial" value="SHVC-7X" />
@@ -7197,7 +7197,7 @@ more investigation needed...
 	</software>
 
 	<software name="aqutal" cloneof="secretst">
-		<description>Aqutallion (Jpn)</description>
+		<description>Aqutallion (Japan)</description>
 		<year>1993</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-AQ" />
@@ -7290,7 +7290,7 @@ more investigation needed...
 	</software>
 
 	<software name="area88" cloneof="unsquad">
-		<description>Area 88 (Jpn)</description>
+		<description>Area 88 (Japan)</description>
 		<year>1991</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-E8" />
@@ -7312,7 +7312,7 @@ more investigation needed...
 
 	<software name="aretha">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Aretha (Jpn)</description>
+		<description>Aretha (Japan)</description>
 		<year>1993</year>
 		<publisher>Yanoman Games</publisher>
 		<info name="serial" value="SHVC-YJ" />
@@ -7338,7 +7338,7 @@ more investigation needed...
 	</software>
 
 	<software name="arkanoidj" cloneof="arkanoid">
-		<description>Arkanoid - Doh It Again (Jpn)</description>
+		<description>Arkanoid - Doh It Again (Japan)</description>
 		<year>1997</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-A6" />
@@ -7400,7 +7400,7 @@ more investigation needed...
 	</software>
 
 	<software name="valken" cloneof="cybernat">
-		<description>Assault Suits Valken (Jpn)</description>
+		<description>Assault Suits Valken (Japan)</description>
 		<year>1992</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-AV" />
@@ -7482,7 +7482,7 @@ more investigation needed...
 
 	<software name="axelayj" cloneof="axelay">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Axelay (Jpn)</description>
+		<description>Axelay (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AX" />
@@ -7543,7 +7543,7 @@ more investigation needed...
 	</software>
 
 	<software name="bahamut">
-		<description>Bahamut Lagoon (Jpn)</description>
+		<description>Bahamut Lagoon (Japan)</description>
 		<year>1996</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AXBJ-JPN" />
@@ -7569,7 +7569,7 @@ more investigation needed...
 	</software>
 
 	<software name="bahamuta" cloneof="bahamut">
-		<description>Bahamut Lagoon (Jpn, alt)</description>
+		<description>Bahamut Lagoon (Japan, alt)</description>
 		<year>1996</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AXBJ-JPN" />
@@ -7597,7 +7597,7 @@ more investigation needed...
 	</software>
 
 	<software name="bakukyuu">
-		<description>Bakukyuu Renpatsu!! Super B-Daman (Jpn)</description>
+		<description>Bakukyuu Renpatsu!! Super B-Daman (Japan)</description>
 		<year>1997</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AAIJ-JPN" />
@@ -7623,7 +7623,7 @@ more investigation needed...
 	</software>
 
 	<software name="3jigen" cloneof="ballz3d">
-		<description>Ballz 3D - 3-jigen Kakutou Ballz (Jpn)</description>
+		<description>Ballz 3D - 3-jigen Kakutou Ballz (Japan)</description>
 		<year>1995</year>
 		<publisher>Media Rings Corporation</publisher>
 		<info name="serial" value="SHVC-ABZJ-JPN" />
@@ -7873,7 +7873,7 @@ more investigation needed...
 	</software>
 
 	<software name="batmanrnj" cloneof="batmanrn">
-		<description>Batman Returns (Jpn)</description>
+		<description>Batman Returns (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-BJ" />
@@ -7894,7 +7894,7 @@ more investigation needed...
 	</software>
 
 	<software name="batblazj" cloneof="batblaz">
-		<description>Battle Blaze (Jpn)</description>
+		<description>Battle Blaze (Japan)</description>
 		<year>1992</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-BZ" />
@@ -8009,7 +8009,7 @@ more investigation needed...
 	</software>
 
 	<software name="batlcomm">
-		<description>Battle Commander - Hachibushuu, Shura no Heihou (Jpn)</description>
+		<description>Battle Commander - Hachibushuu, Shura no Heihou (Japan)</description>
 		<year>1991</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-BC" />
@@ -8035,7 +8035,7 @@ more investigation needed...
 	</software>
 
 	<software name="bdodge">
-		<description>Battle Dodge Ball - Toukyuu Daigekitotsu! (Jpn)</description>
+		<description>Battle Dodge Ball - Toukyuu Daigekitotsu! (Japan)</description>
 		<year>1991</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-BD" />
@@ -8061,7 +8061,7 @@ more investigation needed...
 	</software>
 
 	<software name="bdodge2">
-		<description>Battle Dodge Ball II (Jpn)</description>
+		<description>Battle Dodge Ball II (Japan)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-D2 " />
@@ -8085,7 +8085,7 @@ more investigation needed...
 	</software>
 
 	<software name="battlegpj" cloneof="battlegp">
-		<description>Battle Grand Prix (Jpn)</description>
+		<description>Battle Grand Prix (Japan)</description>
 		<year>1992</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-BG" />
@@ -8126,7 +8126,7 @@ more investigation needed...
 	</software>
 
 	<software name="batlsocr">
-		<description>Battle Soccer - Field no Hasha (Jpn)</description>
+		<description>Battle Soccer - Field no Hasha (Japan)</description>
 		<year>1992</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-B8" />
@@ -8152,7 +8152,7 @@ more investigation needed...
 	</software>
 
 	<software name="batlsoc2">
-		<description>Battle Soccer 2 (Jpn)</description>
+		<description>Battle Soccer 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ABSJ-JPN" />
@@ -8176,7 +8176,7 @@ more investigation needed...
 	</software>
 
 	<software name="battletya" cloneof="battlety">
-		<description>Battle Tycoon - Flash Hiders SFX (Jpn)</description>
+		<description>Battle Tycoon - Flash Hiders SFX (Japan)</description>
 		<year>1995</year>
 		<publisher>Right Stuff</publisher>
 		<info name="serial" value="SHVC-AFHJ-JPN" />
@@ -8292,7 +8292,7 @@ more investigation needed...
 	</software>
 
 	<software name="beautyj" cloneof="beauty">
-		<description>Disney's Beauty and the Beast (Jpn)</description>
+		<description>Disney's Beauty and the Beast (Japan)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-EW" />
@@ -8413,7 +8413,7 @@ more investigation needed...
 	</software>
 
 	<software name="bigpslot">
-		<description>Big Ichigeki! Pachi-Slot Daikouryaku (Jpn)</description>
+		<description>Big Ichigeki! Pachi-Slot Daikouryaku (Japan)</description>
 		<year>1994</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-APDJ-JPN" />
@@ -8530,7 +8530,7 @@ more investigation needed...
 	</software>
 
 	<software name="bingbing">
-		<description>Bing Bing! Bingo (Jpn)</description>
+		<description>Bing Bing! Bingo (Japan)</description>
 		<year>1993</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-3K" />
@@ -8575,7 +8575,7 @@ more investigation needed...
 	</software>
 
 	<software name="sailormn">
-		<description>Bishoujo Senshi Sailormoon (Jpn)</description>
+		<description>Bishoujo Senshi Sailormoon (Japan)</description>
 		<year>1993</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-AE" />
@@ -8599,7 +8599,7 @@ more investigation needed...
 	</software>
 
 	<software name="sailormr">
-		<description>Bishoujo Senshi Sailormoon R (Jpn)</description>
+		<description>Bishoujo Senshi Sailormoon R (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-2Q" />
@@ -8620,7 +8620,7 @@ more investigation needed...
 	</software>
 
 	<software name="sailorsj">
-		<description>Bishoujo Senshi Sailormoon S - Jougai Rantou! Shuyaku Soudatsusen (Jpn)</description>
+		<description>Bishoujo Senshi Sailormoon S - Jougai Rantou! Shuyaku Soudatsusen (Japan)</description>
 		<year>1994</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-AQSJ-JPN" />
@@ -8683,7 +8683,7 @@ more investigation needed...
 	</software>
 
 	<software name="blazeonj" cloneof="blazeon">
-		<description>BlaZeon (Jpn)</description>
+		<description>BlaZeon (Japan)</description>
 		<year>1992</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-BL" />
@@ -8725,7 +8725,7 @@ more investigation needed...
 	</software>
 
 	<software name="bluecrys">
-		<description>The Blue Crystalrod (Jpn)</description>
+		<description>The Blue Crystalrod (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-NU" />
@@ -8792,7 +8792,7 @@ more investigation needed...
 	</software>
 
 	<software name="bokujom1" cloneof="harvmoon">
-		<description>Bokujou Monogatari (Jpn)</description>
+		<description>Bokujou Monogatari (Japan)</description>
 		<year>1996</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-AYWJ-JPN" />
@@ -8818,7 +8818,7 @@ more investigation needed...
 	</software>
 
 	<software name="bombbdam">
-		<description>Bomberman B-Daman (Jpn)</description>
+		<description>Bomberman B-Daman (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AH9J-JPN" />
@@ -9041,7 +9041,7 @@ more investigation needed...
 	</software>
 
 	<software name="bofja" cloneof="bof">
-		<description>Breath of Fire - Ryuu no Senshi (Jpn)</description>
+		<description>Breath of Fire - Ryuu no Senshi (Japan)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-BF" />
@@ -9070,7 +9070,7 @@ more investigation needed...
 
 	<software name="bofj" cloneof="bof">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Breath of Fire - Ryuu no Senshi (Jpn, Rev. A)</description>
+		<description>Breath of Fire - Ryuu no Senshi (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-BF" />
@@ -9126,7 +9126,7 @@ more investigation needed...
 	</software>
 
 	<software name="bof2j" cloneof="bof2">
-		<description>Breath of Fire II (Jpn)</description>
+		<description>Breath of Fire II (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AF2J-JPN" />
@@ -9282,7 +9282,7 @@ more investigation needed...
 	</software>
 
 	<software name="bsxsore" supported="partial">
-		<description>BS-X - Sore wa Namae o Nusumareta Machi no Monogatari (Jpn, Rev. AB)</description>
+		<description>BS-X - Sore wa Namae o Nusumareta Machi no Monogatari (Japan, Rev. AB)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ZBSJ-JPN" />
@@ -9673,7 +9673,7 @@ more investigation needed...
 	</software>
 
 	<software name="ctsuba3">
-		<description>Captain Tsubasa III - Koutei no Chousen (Jpn)</description>
+		<description>Captain Tsubasa III - Koutei no Chousen (Japan)</description>
 		<year>1992</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-C3" />
@@ -9699,7 +9699,7 @@ more investigation needed...
 	</software>
 
 	<software name="ctsuba4">
-		<description>Captain Tsubasa IV - Pro no Rival-tachi (Jpn)</description>
+		<description>Captain Tsubasa IV - Pro no Rival-tachi (Japan)</description>
 		<year>1993</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-T4" />
@@ -9727,7 +9727,7 @@ more investigation needed...
 	</software>
 
 	<software name="ctsuba5">
-		<description>Captain Tsubasa V - Hasha no Shougou Campione (Jpn)</description>
+		<description>Captain Tsubasa V - Hasha no Shougou Campione (Japan)</description>
 		<year>1994</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-AC5J-JPN" />
@@ -9834,7 +9834,7 @@ more investigation needed...
 	</software>
 <!--wip-cb-->
 	<software name="cbchara">
-		<description>CB Chara Wars - Ushinawareta Gag (Jpn)</description>
+		<description>CB Chara Wars - Ushinawareta Gag (Japan)</description>
 		<year>1992</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-CV" />
@@ -9875,7 +9875,7 @@ more investigation needed...
 	</software>
 
 	<software name="champwcsj" cloneof="champwcs">
-		<description>Champions - World Class Soccer (Jpn)</description>
+		<description>Champions - World Class Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Acclain Entertainment</publisher>
 		<info name="serial" value="SHVC-8W" />
@@ -10068,7 +10068,7 @@ more investigation needed...
 	</software>
 
 	<software name="chibimha">
-		<description>Chibi Maruko-chan - Harikiri 365-nichi no Maki (Jpn)</description>
+		<description>Chibi Maruko-chan - Harikiri 365-nichi no Maki (Japan)</description>
 		<year>1991</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-GO" />
@@ -10118,7 +10118,7 @@ more investigation needed...
 	</software>
 
 	<software name="wozz">
-		<description>Chou Mahou Tairiku Wozz (Jpn)</description>
+		<description>Chou Mahou Tairiku Wozz (Japan)</description>
 		<year>1995</year>
 		<publisher>Bullet Proof Software</publisher>
 		<info name="serial" value="SHVC-AWOJ-JPN" />
@@ -10147,7 +10147,7 @@ more investigation needed...
 
 	<software name="chodora" cloneof="mcfang">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Chou Makai Taisen! Dorabocchan (Jpn)</description>
+		<description>Chou Makai Taisen! Dorabocchan (Japan)</description>
 		<year>1993</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-DO" />
@@ -10173,7 +10173,7 @@ more investigation needed...
 	</software>
 
 	<software name="xardionj" cloneof="xardion">
-		<description>Choukou Gasshin Xardion (Jpn)</description>
+		<description>Choukou Gasshin Xardion (Japan)</description>
 		<year>1992</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-XA" />
@@ -10200,7 +10200,7 @@ more investigation needed...
 
 	<software name="chomakai" cloneof="sgng">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Chou Makaimura (Jpn)</description>
+		<description>Chou Makaimura (Japan)</description>
 		<year>1991</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-CM" />
@@ -10247,7 +10247,7 @@ more investigation needed...
 
 	<software name="ctriggerj" cloneof="ctrigger">
 		<!-- Notes: Same rom as Chrono Trigger V-Jump -->
-		<description>Chrono Trigger (Jpn)</description>
+		<description>Chrono Trigger (Japan)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-ACTJ-JPN " />
@@ -10273,7 +10273,7 @@ more investigation needed...
 	</software>
 
 	<software name="ctriggerja" cloneof="ctrigger">
-		<description>Chrono Trigger (Jpn, alt)</description>
+		<description>Chrono Trigger (Japan, alt)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-ACTJ-JPN " />
@@ -10525,7 +10525,7 @@ more investigation needed...
 	</software>
 
 	<software name="computer">
-		<description>Computer Nouryoku Kaiseki - Ultra Baken (Jpn)</description>
+		<description>Computer Nouryoku Kaiseki - Ultra Baken (Japan)</description>
 		<year>1995</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-AUBJ-JPN" />
@@ -10650,7 +10650,7 @@ more investigation needed...
 	</software>
 
 	<software name="crayon">
-		<description>Crayon Shin-chan - Arashi o Yobu Enji (Jpn)</description>
+		<description>Crayon Shin-chan - Arashi o Yobu Enji (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-KU" />
@@ -10675,7 +10675,7 @@ more investigation needed...
 	</software>
 
 	<software name="crayon2">
-		<description>Crayon Shin-chan 2 - Daimaou no Gyakushuu (Jpn)</description>
+		<description>Crayon Shin-chan 2 - Daimaou no Gyakushuu (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-UE" />
@@ -10697,7 +10697,7 @@ more investigation needed...
 	</software>
 
 	<software name="cuonpa">
-		<description>Cu-On-Pa SFC (Jpn)</description>
+		<description>Cu-On-Pa SFC (Japan)</description>
 		<year>1996</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-AC6J-JPN" />
@@ -10744,7 +10744,7 @@ more investigation needed...
 	</software>
 
 	<software name="cyknight">
-		<description>Cyber Knight (Jpn)</description>
+		<description>Cyber Knight (Japan)</description>
 		<year>1992</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-CX" />
@@ -10888,7 +10888,7 @@ more investigation needed...
 	</software>
 
 	<software name="srobot3">
-		<description>Dai-3-ji Super Robot Taisen (Jpn, Rev. B)</description>
+		<description>Dai-3-ji Super Robot Taisen (Japan, Rev. B)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-RT" />
@@ -10918,7 +10918,7 @@ more investigation needed...
 	</software>
 
 	<software name="srobot4a" cloneof="srobot4">
-		<description>Dai-4-ji Super Robot Taisen (Jpn)</description>
+		<description>Dai-4-ji Super Robot Taisen (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AR4J-JPN" />
@@ -10945,7 +10945,7 @@ more investigation needed...
 	</software>
 
 	<software name="daibakjg">
-		<description>Daibakushou Jinsei Gekijou (Jpn)</description>
+		<description>Daibakushou Jinsei Gekijou (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-GH" />
@@ -10966,7 +10966,7 @@ more investigation needed...
 	</software>
 
 	<software name="daibakjd">
-		<description>Daibakushou Jinsei Gekijou - Dokidoki Seishun Hen (Jpn)</description>
+		<description>Daibakushou Jinsei Gekijou - Dokidoki Seishun Hen (Japan)</description>
 		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-G8" />
@@ -10990,7 +10990,7 @@ more investigation needed...
 	</software>
 
 	<software name="daibakjo">
-		<description>Daibakushou Jinsei Gekijou - Ooedo Nikki (Jpn)</description>
+		<description>Daibakushou Jinsei Gekijou - Ooedo Nikki (Japan)</description>
 		<year>1994</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-AKKJ-JPN" />
@@ -11011,7 +11011,7 @@ more investigation needed...
 	</software>
 
 	<software name="daibakjz">
-		<description>Daibakushou Jinsei Gekijou - Zukkoke Salaryman Hen (Jpn)</description>
+		<description>Daibakushou Jinsei Gekijou - Zukkoke Salaryman Hen (Japan)</description>
 		<year>1995</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-AZSJ-JPN" />
@@ -11037,7 +11037,7 @@ more investigation needed...
 	</software>
 
 	<software name="daimonoga" cloneof="daimonog">
-		<description>Daikaijuu Monogatari (Jpn)</description>
+		<description>Daikaijuu Monogatari (Japan)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-ADKJ-JPN" />
@@ -11065,7 +11065,7 @@ more investigation needed...
 	</software>
 
 	<software name="daimono2">
-		<description>Daikaijuu Monogatari II (Jpn)</description>
+		<description>Daikaijuu Monogatari II (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AE6J-JPN" />
@@ -11095,7 +11095,7 @@ more investigation needed...
 	</software>
 
 	<software name="daikok2" cloneof="newhoriz">
-		<description>Daikoukai Jidai II (Jpn)</description>
+		<description>Daikoukai Jidai II (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-QL" />
@@ -11121,7 +11121,7 @@ more investigation needed...
 	</software>
 
 	<software name="daisenx">
-		<description>Daisenryaku Expert (Jpn)</description>
+		<description>Daisenryaku Expert (Japan)</description>
 		<year>1992</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-GS" />
@@ -11147,7 +11147,7 @@ more investigation needed...
 	</software>
 
 	<software name="dariustwj" cloneof="dariustw">
-		<description>Darius Twin (Jpn)</description>
+		<description>Darius Twin (Japan)</description>
 		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-DT" />
@@ -11208,7 +11208,7 @@ more investigation needed...
 	</software>
 
 	<software name="deaddanc" cloneof="tuffnuff">
-		<description>Dead Dance (Jpn)</description>
+		<description>Dead Dance (Japan)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-TE" />
@@ -11315,7 +11315,7 @@ more investigation needed...
 	</software>
 
 	<software name="langrissa" cloneof="langriss">
-		<description>Der Langrisser (Jpn)</description>
+		<description>Der Langrisser (Japan)</description>
 		<year>1995</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-ALGJ-JPN" />
@@ -11341,7 +11341,7 @@ more investigation needed...
 	</software>
 
 	<software name="derbyjoca" cloneof="derbyjoc">
-		<description>Derby Jockey - Kishu Ou e no Michi (Jpn)</description>
+		<description>Derby Jockey - Kishu Ou e no Michi (Japan)</description>
 		<year>1994</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-JQ" />
@@ -11367,7 +11367,7 @@ more investigation needed...
 	</software>
 
 	<software name="derbyjoc">
-		<description>Derby Jockey - Kishu Ou e no Michi (Jpn, Rev. A)</description>
+		<description>Derby Jockey - Kishu Ou e no Michi (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-JQ" />
@@ -11394,7 +11394,7 @@ more investigation needed...
 	</software>
 
 	<software name="dstall96" supported="partial">
-		<description>Derby Stallion 96 (Jpn)</description>
+		<description>Derby Stallion 96 (Japan)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-ZDBJ-JPN" />
@@ -11420,7 +11420,7 @@ more investigation needed...
 	</software>
 
 	<software name="dstall2">
-		<description>Derby Stallion II (Jpn)</description>
+		<description>Derby Stallion II (Japan)</description>
 		<year>1994</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-A7" />
@@ -11448,7 +11448,7 @@ more investigation needed...
 	</software>
 
 	<software name="dstall3c" cloneof="dstall3">
-		<description>Derby Stallion III (Jpn)</description>
+		<description>Derby Stallion III (Japan)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AD3J-JPN" />
@@ -11474,7 +11474,7 @@ more investigation needed...
 	</software>
 
 	<software name="dstall3ca" cloneof="dstall3">
-		<description>Derby Stallion III (Jpn, alt)</description>
+		<description>Derby Stallion III (Japan, alt)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AD3J-JPN" />
@@ -11502,7 +11502,7 @@ more investigation needed...
 	</software>
 
 	<software name="dstall3a" cloneof="dstall3">
-		<description>Derby Stallion III (Jpn, Rev. B)</description>
+		<description>Derby Stallion III (Japan, Rev. B)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AD3J-JPN-2" />
@@ -11531,7 +11531,7 @@ more investigation needed...
 	</software>
 
 	<software name="dstall3">
-		<description>Derby Stallion III (Jpn, Rev. D)</description>
+		<description>Derby Stallion III (Japan, Rev. D)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AD3J-JPN-2" />
@@ -11631,7 +11631,7 @@ more investigation needed...
 	</software>
 
 	<software name="dokap321a" cloneof="dokap321">
-		<description>Dokapon 3-2-1 - Arashi o Yobu Yuujou (Jpn)</description>
+		<description>Dokapon 3-2-1 - Arashi o Yobu Yuujou (Japan)</description>
 		<year>1994</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-AIXJ-JPN" />
@@ -11659,7 +11659,7 @@ more investigation needed...
 	</software>
 
 	<software name="dokapong">
-		<description>Dokapon Gaiden - Honoo no Audition (Jpn)</description>
+		<description>Dokapon Gaiden - Honoo no Audition (Japan)</description>
 		<year>1995</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-AGNJ-JPN" />
@@ -11680,7 +11680,7 @@ more investigation needed...
 	</software>
 
 	<software name="libertyj" cloneof="liberty">
-		<description>Dokuritsu Sensou - Liberty or Death (Jpn)</description>
+		<description>Dokuritsu Sensou - Liberty or Death (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-QI" />
@@ -11708,7 +11708,7 @@ more investigation needed...
 	</software>
 
 	<software name="dolkusay">
-		<description>Dolucky no Kusayakiu (Jpn)</description>
+		<description>Dolucky no Kusayakiu (Japan)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-IM" />
@@ -11852,7 +11852,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongc2g" cloneof="dkongc2">
-		<description>Donkey Kong Country 2 - Diddy's Kong Quest (Ger, Rev. A)</description>
+		<description>Donkey Kong Country 2 - Diddy's Kong Quest (Germany, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-ADNP-EUR" />
@@ -12031,7 +12031,7 @@ more investigation needed...
 	</software>
 
 	<software name="doraemona" cloneof="doraemon">
-		<description>Doraemon - Nobita to Yousei no Kuni (Jpn)</description>
+		<description>Doraemon - Nobita to Yousei no Kuni (Japan)</description>
 		<year>1993</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-DR" />
@@ -12052,7 +12052,7 @@ more investigation needed...
 	</software>
 
 	<software name="doraemn2">
-		<description>Doraemon 2 - Nobita no Toys Land Daibouken (Jpn)</description>
+		<description>Doraemon 2 - Nobita no Toys Land Daibouken (Japan)</description>
 		<year>1993</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-2D" />
@@ -12073,7 +12073,7 @@ more investigation needed...
 	</software>
 
 	<software name="doraemn3">
-		<description>Doraemon 3 - Nobita to Toki no Hougyoku (Jpn)</description>
+		<description>Doraemon 3 - Nobita to Toki no Hougyoku (Japan)</description>
 		<year>1994</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-4T" />
@@ -12097,7 +12097,7 @@ more investigation needed...
 	</software>
 
 	<software name="doraemn4">
-		<description>Doraemon 4 - Nobita to Tsuki no Oukoku (Jpn)</description>
+		<description>Doraemon 4 - Nobita to Tsuki no Oukoku (Japan)</description>
 		<year>1995</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-AD4J-JPN" />
@@ -12162,7 +12162,7 @@ more investigation needed...
 	</software>
 
 	<software name="dbzbutodj" cloneof="dbzbutod">
-		<description>Dragon Ball Z - Super Butouden (Jpn)</description>
+		<description>Dragon Ball Z - Super Butouden (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-Z2" />
@@ -12183,7 +12183,7 @@ more investigation needed...
 	</software>
 
 	<software name="dbzbutodja" cloneof="dbzbutod">
-		<description>Dragon Ball Z - Super Butouden (Jpn, alt)</description>
+		<description>Dragon Ball Z - Super Butouden (Japan, alt)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-Z2" />
@@ -12207,7 +12207,7 @@ more investigation needed...
 	</software>
 
 	<software name="dbzbuto2ja" cloneof="dbzbuto2">
-		<description>Dragon Ball Z - Super Butouden 2 (Jpn)</description>
+		<description>Dragon Ball Z - Super Butouden 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-EF" />
@@ -12229,7 +12229,7 @@ more investigation needed...
 	</software>
 
 	<software name="dbzbuto2ja1" cloneof="dbzbuto2">
-		<description>Dragon Ball Z - Super Butouden 2 (Jpn, alt)</description>
+		<description>Dragon Ball Z - Super Butouden 2 (Japan, alt)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-EF" />
@@ -12254,7 +12254,7 @@ more investigation needed...
 	</software>
 
 	<software name="dbzbuto3" cloneof="dbzmenac">
-		<description>Dragon Ball Z - Super Butouden 3 (Jpn)</description>
+		<description>Dragon Ball Z - Super Butouden 3 (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AZ4J-JPN" />
@@ -12276,7 +12276,7 @@ more investigation needed...
 	</software>
 
 	<software name="dbztotsu">
-		<description>Dragon Ball Z - Super Gokuu Den - Totsugeki Hen (Jpn)</description>
+		<description>Dragon Ball Z - Super Gokuu Den - Totsugeki Hen (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AZ5J-JPN" />
@@ -12303,7 +12303,7 @@ more investigation needed...
 	</software>
 
 	<software name="dbzsaiya1" cloneof="dbzsaiya">
-		<description>Dragon Ball Z - Super Saiya Densetsu (Jpn)</description>
+		<description>Dragon Ball Z - Super Saiya Densetsu (Japan)</description>
 		<year>1992</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-DB" />
@@ -12329,7 +12329,7 @@ more investigation needed...
 	</software>
 
 	<software name="dknight4">
-		<description>Dragon Knight 4 (Jpn)</description>
+		<description>Dragon Knight 4 (Japan)</description>
 		<year>1996</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A87J-JPN" />
@@ -12355,7 +12355,7 @@ more investigation needed...
 	</software>
 
 	<software name="dquest12">
-		<description>Dragon Quest I &amp; II (Jpn)</description>
+		<description>Dragon Quest I &amp; II (Japan)</description>
 		<year>1993</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-DQ" />
@@ -12383,7 +12383,7 @@ more investigation needed...
 	</software>
 
 	<software name="dquest3">
-		<description>Dragon Quest III - Soshite Densetsu e... (Jpn)</description>
+		<description>Dragon Quest III - Soshite Densetsu e... (Japan)</description>
 		<year>1996</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AQ3J-JPN" />
@@ -12409,7 +12409,7 @@ more investigation needed...
 	</software>
 
 	<software name="dquest5">
-		<description>Dragon Quest V - Tenkuu no Hanayome (Jpn)</description>
+		<description>Dragon Quest V - Tenkuu no Hanayome (Japan)</description>
 		<year>1992</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-D5" />
@@ -12437,7 +12437,7 @@ more investigation needed...
 	</software>
 
 	<software name="dquest6">
-		<description>Dragon Quest VI - Maboroshi no Daichi (Jpn)</description>
+		<description>Dragon Quest VI - Maboroshi no Daichi (Japan)</description>
 		<year>1995</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AQ6J-JPN" />
@@ -12463,7 +12463,7 @@ more investigation needed...
 	</software>
 
 	<software name="dquest6a" cloneof="dquest6">
-		<description>Dragon Quest VI - Maboroshi no Daichi (Jpn, alt)</description>
+		<description>Dragon Quest VI - Maboroshi no Daichi (Japan, alt)</description>
 		<year>1995</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AQ6J-JPN" />
@@ -12492,7 +12492,7 @@ more investigation needed...
 
 	<software name="dslayed">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Dragon Slayer - Eiyuu Densetsu (Jpn)</description>
+		<description>Dragon Slayer - Eiyuu Densetsu (Japan)</description>
 		<year>1992</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-DS" />
@@ -12538,7 +12538,7 @@ more investigation needed...
 	</software>
 
 	<software name="drakkhenj" cloneof="drakkhen">
-		<description>Drakkhen (Jpn)</description>
+		<description>Drakkhen (Japan)</description>
 		<year>1991</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-DK" />
@@ -12589,7 +12589,7 @@ more investigation needed...
 	</software>
 
 	<software name="dreambas">
-		<description>Dream Basketball - Dunk &amp; Hoop (Jpn)</description>
+		<description>Dream Basketball - Dunk &amp; Hoop (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-ADBJ-JPN" />
@@ -12613,7 +12613,7 @@ more investigation needed...
 	</software>
 
 	<software name="shotok94">
-		<description>Drift King Shutokou Battle '94 - Tsuchiya Keiichi &amp; Bandou Masaaki (Jpn)</description>
+		<description>Drift King Shutokou Battle '94 - Tsuchiya Keiichi &amp; Bandou Masaaki (Japan)</description>
 		<year>1994</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-94" />
@@ -12645,7 +12645,7 @@ more investigation needed...
 	</software>
 
 	<software name="shotoku2">
-		<description>Drift King Shutokou Battle 2 - Tsuchiya Keiichi &amp; Bandou Masaaki (Jpn)</description>
+		<description>Drift King Shutokou Battle 2 - Tsuchiya Keiichi &amp; Bandou Masaaki (Japan)</description>
 		<year>1995</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-ASXJ-JPN" />
@@ -12706,7 +12706,7 @@ more investigation needed...
 	</software>
 
 	<software name="dynastad">
-		<description>Dynamic Stadium (Jpn)</description>
+		<description>Dynamic Stadium (Japan)</description>
 		<year>1993</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-YD" />
@@ -12732,7 +12732,7 @@ more investigation needed...
 	</software>
 <!-- wip-e -->
 	<software name="earthlgt">
-		<description>Earth Light (Jpn)</description>
+		<description>Earth Light (Japan)</description>
 		<year>1992</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-H3" />
@@ -12842,7 +12842,7 @@ more investigation needed...
 	</software>
 
 	<software name="elfaria">
-		<description>Elfaria - The Isle of the Blest (Jpn)</description>
+		<description>Elfaria - The Isle of the Blest (Japan)</description>
 		<year>1993</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-H5" />
@@ -12891,7 +12891,7 @@ more investigation needed...
 	</software>
 
 	<software name="elnard" cloneof="7thsaga">
-		<description>Elnard (Jpn)</description>
+		<description>Elnard (Japan)</description>
 		<year>1993</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-EL" />
@@ -12990,7 +12990,7 @@ more investigation needed...
 
 	<software name="estpolis" cloneof="lufia">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Estpolis Denki (Jpn)</description>
+		<description>Estpolis Denki (Japan)</description>
 		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-ES" />
@@ -13016,7 +13016,7 @@ more investigation needed...
 	</software>
 
 	<software name="estpoli2" cloneof="lufia2">
-		<description>Estpolis Denki II (Jpn)</description>
+		<description>Estpolis Denki II (Japan)</description>
 		<year>1995</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-ANIJ-JPN" />
@@ -13069,7 +13069,7 @@ more investigation needed...
 	</software>
 
 	<software name="exhaustj" cloneof="exhaust">
-		<description>Exhaust Heat (Jpn)</description>
+		<description>Exhaust Heat (Japan)</description>
 		<year>1992</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-EH" />
@@ -13095,7 +13095,7 @@ more investigation needed...
 	</software>
 
 	<software name="exhaust2" cloneof="f1roc2">
-		<description>Exhaust Heat II - F1 Driver e no Kiseki (Jpn)</description>
+		<description>Exhaust Heat II - F1 Driver e no Kiseki (Japan)</description>
 		<year>1993</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-E2" />
@@ -13148,7 +13148,7 @@ more investigation needed...
 	</software>
 
 	<software name="f15strik" cloneof="sstrike">
-		<description>F-15 Super Strike Eagle (Jpn)</description>
+		<description>F-15 Super Strike Eagle (Japan)</description>
 		<year>1993</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-EG" />
@@ -13541,7 +13541,7 @@ more investigation needed...
 	</software>
 
 	<software name="ffant4ja" cloneof="ffant2">
-		<description>Final Fantasy IV (Jpn)</description>
+		<description>Final Fantasy IV (Japan)</description>
 		<year>1991</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-F4" />
@@ -13567,7 +13567,7 @@ more investigation needed...
 	</software>
 
 	<software name="ffant4j" cloneof="ffant2">
-		<description>Final Fantasy IV (Jpn, Rev. A)</description>
+		<description>Final Fantasy IV (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-F4" />
@@ -13595,7 +13595,7 @@ more investigation needed...
 
 	<software name="ffant4je" cloneof="ffant2">
 		<!-- Notes: this clone had its own serial, FE instead of F4 -->
-		<description>Final Fantasy IV - Easy Type (Jpn)</description>
+		<description>Final Fantasy IV - Easy Type (Japan)</description>
 		<year>1991</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-FE" />
@@ -13621,7 +13621,7 @@ more investigation needed...
 	</software>
 
 	<software name="ffant5j">
-		<description>Final Fantasy V (Jpn)</description>
+		<description>Final Fantasy V (Japan)</description>
 		<year>1992</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-F5" />
@@ -13647,7 +13647,7 @@ more investigation needed...
 	</software>
 
 	<software name="ffant5ja" cloneof="ffant5j">
-		<description>Final Fantasy V (Jpn, alt)</description>
+		<description>Final Fantasy V (Japan, alt)</description>
 		<year>1992</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-F5" />
@@ -13676,7 +13676,7 @@ more investigation needed...
 	</software>
 
 	<software name="ffant6j" cloneof="ffant3">
-		<description>Final Fantasy VI (Jpn)</description>
+		<description>Final Fantasy VI (Japan)</description>
 		<year>1994</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-F6" />
@@ -13704,7 +13704,7 @@ more investigation needed...
 	</software>
 
 	<software name="ffant6ja" cloneof="ffant3">
-		<description>Final Fantasy VI (Jpn, alt)</description>
+		<description>Final Fantasy VI (Japan, alt)</description>
 		<year>1994</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-F6" />
@@ -13735,7 +13735,7 @@ more investigation needed...
 	</software>
 
 	<software name="ffantmqj" cloneof="mquest">
-		<description>Final Fantasy USA - Mystic Quest (Jpn)</description>
+		<description>Final Fantasy USA - Mystic Quest (Japan)</description>
 		<year>1993</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-MQ" />
@@ -13762,7 +13762,7 @@ more investigation needed...
 
 	<software name="ffightj" cloneof="ffight">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Final Fight (Jpn)</description>
+		<description>Final Fight (Japan)</description>
 		<year>1990</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-FT" />
@@ -13804,7 +13804,7 @@ more investigation needed...
 
 	<software name="ffight2j" cloneof="ffight2">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Final Fight 2 (Jpn)</description>
+		<description>Final Fight 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-F2" />
@@ -13890,7 +13890,7 @@ more investigation needed...
 	</software>
 
 	<software name="firembmn1" cloneof="firembmn">
-		<description>Fire Emblem - Monshou no Nazo (Jpn)</description>
+		<description>Fire Emblem - Monshou no Nazo (Japan)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-EM" />
@@ -13918,7 +13918,7 @@ more investigation needed...
 	</software>
 
 	<software name="firembsk">
-		<description>Fire Emblem - Seisen no Keifu (Jpn)</description>
+		<description>Fire Emblem - Seisen no Keifu (Japan)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-A32J-JPN" />
@@ -13944,7 +13944,7 @@ more investigation needed...
 	</software>
 
 	<software name="fireproj">
-		<description>Fire Pro Joshi - All Star Dream Slam (Jpn)</description>
+		<description>Fire Pro Joshi - All Star Dream Slam (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-J4" />
@@ -14027,7 +14027,7 @@ more investigation needed...
 	</software>
 
 	<software name="flashbj" cloneof="flashb">
-		<description>Flashback (Jpn)</description>
+		<description>Flashback (Japan)</description>
 		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-LQ" />
@@ -14112,7 +14112,7 @@ more investigation needed...
 	</software>
 
 	<software name="slamdunk">
-		<description>From TV Animation Slam Dunk - Yonkyou Gekitotsu!! (Jpn)</description>
+		<description>From TV Animation Slam Dunk - Yonkyou Gekitotsu!! (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-UX" />
@@ -14136,7 +14136,7 @@ more investigation needed...
 	</software>
 
 	<software name="slamdnk2">
-		<description>From TV Animation Slam Dunk 2 - IH Yosen Kanzen Ban!! (Jpn)</description>
+		<description>From TV Animation Slam Dunk 2 - IH Yosen Kanzen Ban!! (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-ASLJ-JPN" />
@@ -14160,7 +14160,7 @@ more investigation needed...
 	</software>
 
 	<software name="frontmisa" cloneof="frontmis">
-		<description>Front Mission (Jpn)</description>
+		<description>Front Mission (Japan)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AGCJ-JPN" />
@@ -14188,7 +14188,7 @@ more investigation needed...
 	</software>
 
 	<software name="gunhazrd">
-		<description>Front Mission Series - Gun Hazard (Jpn)</description>
+		<description>Front Mission Series - Gun Hazard (Japan)</description>
 		<year>1996</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AZGJ-JPN" />
@@ -14215,7 +14215,7 @@ more investigation needed...
 	</software>
 
 	<software name="gunhazrd1" cloneof="gunhazrd">
-		<description>Front Mission Series - Gun Hazard (Jpn, alt)</description>
+		<description>Front Mission Series - Gun Hazard (Japan, alt)</description>
 		<year>1996</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AZGJ-JPN" />
@@ -14244,7 +14244,7 @@ more investigation needed...
 	</software>
 
 	<software name="fushidn2a" cloneof="fushidn2">
-		<description>Fushigi no Dungeon 2 - Fuurai no Shiren (Jpn)</description>
+		<description>Fushigi no Dungeon 2 - Fuurai no Shiren (Japan)</description>
 		<year>1995</year>
 		<publisher>Chunsoft</publisher>
 		<info name="serial" value="SHVC-AAXJ-JPN" />
@@ -14320,7 +14320,7 @@ more investigation needed...
 
 	<software name="fzeroj" cloneof="fzero">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>F-Zero (Jpn)</description>
+		<description>F-Zero (Japan)</description>
 		<year>1990</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-FZ" />
@@ -14358,7 +14358,7 @@ more investigation needed...
 	</software>
 <!-- wip-g -->
 	<software name="gaiagens" cloneof="illtime">
-		<description>Gaia Gensouki (Jpn)</description>
+		<description>Gaia Gensouki (Japan)</description>
 		<year>1993</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-JG" />
@@ -14384,7 +14384,7 @@ more investigation needed...
 	</software>
 
 	<software name="gakkoatt">
-		<description>Gakkou de Atta Kowai Hanashi (Jpn)</description>
+		<description>Gakkou de Atta Kowai Hanashi (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AHXJ-JPN" />
@@ -14410,7 +14410,7 @@ more investigation needed...
 	</software>
 
 	<software name="galwars">
-		<description>Galaxy Wars (Jpn)</description>
+		<description>Galaxy Wars (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AGWJ-JPN" />
@@ -14431,7 +14431,7 @@ more investigation needed...
 	</software>
 
 	<software name="gambler">
-		<description>Gambler Jikochuushinha - Mahjong Kouisen (Jpn)</description>
+		<description>Gambler Jikochuushinha - Mahjong Kouisen (Japan)</description>
 		<year>1992</year>
 		<publisher>Palsoft</publisher>
 		<info name="serial" value="SHVC-GJ" />
@@ -14452,7 +14452,7 @@ more investigation needed...
 	</software>
 
 	<software name="ggoemona" cloneof="mystninj">
-		<description>Ganbare Goemon - Yuki Hime Kyuushutsu Emaki (Jpn)</description>
+		<description>Ganbare Goemon - Yuki Hime Kyuushutsu Emaki (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-GG" />
@@ -14473,7 +14473,7 @@ more investigation needed...
 	</software>
 
 	<software name="ggoemon" cloneof="mystninj">
-		<description>Ganbare Goemon - Yuki Hime Kyuushutsu Emaki (Jpn, Rev. B)</description>
+		<description>Ganbare Goemon - Yuki Hime Kyuushutsu Emaki (Japan, Rev. B)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-GG" />
@@ -14495,7 +14495,7 @@ more investigation needed...
 	</software>
 
 	<software name="ggoemon2">
-		<description>Ganbare Goemon 2 - Kiteretsu Shougun Magginesu (Jpn)</description>
+		<description>Ganbare Goemon 2 - Kiteretsu Shougun Magginesu (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-KL" />
@@ -14523,7 +14523,7 @@ more investigation needed...
 	</software>
 
 	<software name="ggoemkirb" cloneof="ggoemkir">
-		<description>Ganbare Goemon Kirakira Douchuu - Boku ga Dancer ni Natta Wake (Jpn)</description>
+		<description>Ganbare Goemon Kirakira Douchuu - Boku ga Dancer ni Natta Wake (Japan)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-A4GJ-JPN" />
@@ -14550,7 +14550,7 @@ more investigation needed...
 	</software>
 
 	<software name="gansopac">
-		<description>Ganso Pachinko Ou (Jpn)</description>
+		<description>Ganso Pachinko Ou (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-OY" />
@@ -14571,7 +14571,7 @@ more investigation needed...
 	</software>
 
 	<software name="garoua" cloneof="fatfury">
-		<description>Garou Densetsu - Shukumei no Tatakai (Jpn)</description>
+		<description>Garou Densetsu - Shukumei no Tatakai (Japan)</description>
 		<year>1992</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-GN" />
@@ -14595,7 +14595,7 @@ more investigation needed...
 	</software>
 
 	<software name="garou2a" cloneof="fatfury2">
-		<description>Garou Densetsu 2 - Aratanaru Tatakai (Jpn)</description>
+		<description>Garou Densetsu 2 - Aratanaru Tatakai (Japan)</description>
 		<year>1993</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-DJ" />
@@ -14619,7 +14619,7 @@ more investigation needed...
 	</software>
 
 	<software name="garousp" cloneof="fatfursp">
-		<description>Garou Densetsu Special (Jpn)</description>
+		<description>Garou Densetsu Special (Japan)</description>
 		<year>1994</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-3R" />
@@ -14644,7 +14644,7 @@ more investigation needed...
 	</software>
 
 	<software name="gdleena" cloneof="gdleen">
-		<description>Gdleen (Jpn)</description>
+		<description>Gdleen (Japan)</description>
 		<year>1991</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-GD" />
@@ -14670,7 +14670,7 @@ more investigation needed...
 	</software>
 
 	<software name="gegege">
-		<description>GeGeGe no Kitarou - Fukkatsu! Tenma Daiou (Jpn)</description>
+		<description>GeGeGe no Kitarou - Fukkatsu! Tenma Daiou (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-G4" />
@@ -14691,7 +14691,7 @@ more investigation needed...
 	</software>
 
 	<software name="genocid2">
-		<description>Genocide 2 (Jpn)</description>
+		<description>Genocide 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-2I" />
@@ -14712,7 +14712,7 @@ more investigation needed...
 	</software>
 
 	<software name="ghostcha">
-		<description>Ghost Chaser Densei (Jpn)</description>
+		<description>Ghost Chaser Densei (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ET" />
@@ -14733,7 +14733,7 @@ more investigation needed...
 	</software>
 
 	<software name="gindamapa" cloneof="gindamap">
-		<description>Gindama Oyakata no Pachinko Hisshouhou (Jpn)</description>
+		<description>Gindama Oyakata no Pachinko Hisshouhou (Japan)</description>
 		<year>1995</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AJPJ-JPN" />
@@ -14761,7 +14761,7 @@ more investigation needed...
 	</software>
 
 	<software name="gionbana">
-		<description>Gionbana (Jpn)</description>
+		<description>Gionbana (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AHFJ-JPN" />
@@ -14782,7 +14782,7 @@ more investigation needed...
 	</software>
 
 	<software name="gogoack2">
-		<description>Go Go Ackman 2 (Jpn)</description>
+		<description>Go Go Ackman 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A92J-JPN" />
@@ -14806,7 +14806,7 @@ more investigation needed...
 	</software>
 
 	<software name="gogoack3">
-		<description>Go Go Ackman 3 (Jpn)</description>
+		<description>Go Go Ackman 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AVPJ-JPN" />
@@ -14827,7 +14827,7 @@ more investigation needed...
 	</software>
 
 	<software name="gokuparo">
-		<description>Gokujou Parodius (Jpn)</description>
+		<description>Gokujou Parodius (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AGPJ-JPN" />
@@ -14869,7 +14869,7 @@ more investigation needed...
 	</software>
 
 	<software name="gouketsu" cloneof="powerins">
-		<description>Gouketsuji Ichizoku (Jpn)</description>
+		<description>Gouketsuji Ichizoku (Japan)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-AGKJ-JPN" />
@@ -14893,7 +14893,7 @@ more investigation needed...
 	</software>
 
 	<software name="gp1j" cloneof="gp1">
-		<description>GP-1 (Jpn)</description>
+		<description>GP-1 (Japan)</description>
 		<year>1993</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-G7" />
@@ -14914,7 +14914,7 @@ more investigation needed...
 
 	<software name="gradius3j" cloneof="gradius3">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Gradius III (Jpn)</description>
+		<description>Gradius III (Japan)</description>
 		<year>1990</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-G3" />
@@ -14935,7 +14935,7 @@ more investigation needed...
 	</software>
 
 	<software name="gbattle2">
-		<description>The Great Battle II - Last Fighter Twin (Jpn)</description>
+		<description>The Great Battle II - Last Fighter Twin (Japan)</description>
 		<year>1992</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-3L" />
@@ -14956,7 +14956,7 @@ more investigation needed...
 	</software>
 
 	<software name="gbattle3">
-		<description>The Great Battle III (Jpn)</description>
+		<description>The Great Battle III (Japan)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-B3" />
@@ -14980,7 +14980,7 @@ more investigation needed...
 	</software>
 
 	<software name="gbattle4">
-		<description>The Great Battle IV (Jpn)</description>
+		<description>The Great Battle IV (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-4F" />
@@ -15005,7 +15005,7 @@ more investigation needed...
 	</software>
 
 	<software name="gunforcej" cloneof="gunforce">
-		<description>GunForce - Battle Fire Engulfed Terror Island (Jpn)</description>
+		<description>GunForce - Battle Fire Engulfed Terror Island (Japan)</description>
 		<year>1992</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="SHVC-GU" />
@@ -15026,7 +15026,7 @@ more investigation needed...
 	</software>
 <!-- wip-h -->
 	<software name="habumeij">
-		<description>Habu Meijin no Omoshiro Shougi (Jpn)</description>
+		<description>Habu Meijin no Omoshiro Shougi (Japan)</description>
 		<year>1995</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-IL" />
@@ -15092,7 +15092,7 @@ more investigation needed...
 	</software>
 
 	<software name="hanjuher">
-		<description>Hanjuku Hero - Ah, Sekai yo Hanjuku Nare...!! (Jpn)</description>
+		<description>Hanjuku Hero - Ah, Sekai yo Hanjuku Nare...!! (Japan)</description>
 		<year>1992</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-HH" />
@@ -15143,7 +15143,7 @@ more investigation needed...
 	</software>
 
 	<software name="hattrick" cloneof="eurofoot">
-		<description>Hat Trick Hero (Jpn)</description>
+		<description>Hat Trick Hero (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-HT" />
@@ -15164,7 +15164,7 @@ more investigation needed...
 	</software>
 
 	<software name="hattric2">
-		<description>Hat Trick Hero 2 (Jpn)</description>
+		<description>Hat Trick Hero 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-2Y" />
@@ -15185,7 +15185,7 @@ more investigation needed...
 	</software>
 
 	<software name="moritash">
-		<description>Hayazashi Nidan Morita Shougi (Jpn)</description>
+		<description>Hayazashi Nidan Morita Shougi (Japan)</description>
 		<year>1993</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-2M" />
@@ -15214,7 +15214,7 @@ more investigation needed...
 	</software>
 
 	<software name="moritas2" supported="no"> <!-- unemulated additional hardware (ST018) -->
-		<description>Hayazashi Nidan Morita Shougi 2 (Jpn)</description>
+		<description>Hayazashi Nidan Morita Shougi 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-A2MJ-JPN" />
@@ -15247,7 +15247,7 @@ more investigation needed...
 	</software>
 
 	<software name="hiryukgf">
-		<description>Hiryuu no Ken S - Golden Fighter (Jpn)</description>
+		<description>Hiryuu no Ken S - Golden Fighter (Japan)</description>
 		<year>1992</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-HK" />
@@ -15271,7 +15271,7 @@ more investigation needed...
 	</software>
 
 	<software name="hiryukhv">
-		<description>Hiryuu no Ken S - Hyper Version (Jpn)</description>
+		<description>Hiryuu no Ken S - Hyper Version (Japan)</description>
 		<year>1992</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-HP" />
@@ -15295,7 +15295,7 @@ more investigation needed...
 	</software>
 
 	<software name="hisspac1">
-		<description>Hissatsu Pachinko Collection (Jpn)</description>
+		<description>Hissatsu Pachinko Collection (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-AHPJ-JPN" />
@@ -15322,7 +15322,7 @@ more investigation needed...
 	</software>
 
 	<software name="his777f1">
-		<description>Hisshou 777 Fighter - Pachi-Slot Ryuuguu Densetsu (Jpn)</description>
+		<description>Hisshou 777 Fighter - Pachi-Slot Ryuuguu Densetsu (Japan)</description>
 		<year>1994</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-IH" />
@@ -15367,7 +15367,7 @@ more investigation needed...
 	</software>
 
 	<software name="ddanpei">
-		<description>Honoo no Toukyuuji - Dodge Danpei (Jpn)</description>
+		<description>Honoo no Toukyuuji - Dodge Danpei (Japan)</description>
 		<year>1992</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-DD" />
@@ -15388,7 +15388,7 @@ more investigation needed...
 	</software>
 
 	<software name="honktmn2">
-		<description>Honkaku Mahjong - Tetsuman II (Jpn)</description>
+		<description>Honkaku Mahjong - Tetsuman II (Japan)</description>
 		<year>1994</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-AOXJ-JPN" />
@@ -15453,7 +15453,7 @@ more investigation needed...
 	</software>
 
 	<software name="kirbysdb" cloneof="kirbyfun">
-		<description>Hoshi no Kirby - Super Deluxe (Jpn)</description>
+		<description>Hoshi no Kirby - Super Deluxe (Japan)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-AKFJ-JPN / G744105" />
@@ -15479,7 +15479,7 @@ more investigation needed...
 	</software>
 
 	<software name="humanbas">
-		<description>Human Baseball (Jpn)</description>
+		<description>Human Baseball (Japan)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-HB" />
@@ -15501,7 +15501,7 @@ more investigation needed...
 	</software>
 
 	<software name="humangp" cloneof="f1polepo">
-		<description>Human Grand Prix (Jpn)</description>
+		<description>Human Grand Prix (Japan)</description>
 		<year>1992</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-HG" />
@@ -15527,7 +15527,7 @@ more investigation needed...
 	</software>
 
 	<software name="humangp3">
-		<description>Human Grand Prix III - F1 Triple Battle (Jpn)</description>
+		<description>Human Grand Prix III - F1 Triple Battle (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AGXJ-JPN" />
@@ -15610,7 +15610,7 @@ more investigation needed...
 	</software>
 <!-- wip-i -->
 	<software name="ikariyou" cloneof="oplogicb">
-		<description>Ikari no Yousai (Jpn)</description>
+		<description>Ikari no Yousai (Japan)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-IY" />
@@ -15667,7 +15667,7 @@ more investigation needed...
 	</software>
 
 	<software name="illtimef" cloneof="illtime">
-		<description>Illusion of Time (Fra)</description>
+		<description>Illusion of Time (France)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-JG-FRA/SFRA" />
@@ -15693,7 +15693,7 @@ more investigation needed...
 	</software>
 
 	<software name="illtimega" cloneof="illtime">
-		<description>Illusion of Time (Ger)</description>
+		<description>Illusion of Time (Germany)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-JG-NOE/SFRG" />
@@ -15719,7 +15719,7 @@ more investigation needed...
 	</software>
 
 	<software name="illtimeg" cloneof="illtime">
-		<description>Illusion of Time (Ger, Rev. A)</description>
+		<description>Illusion of Time (Germany, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-JG-NOE/SFRG" />
@@ -15951,7 +15951,7 @@ more investigation needed...
 	</software>
 
 	<software name="itadaki2">
-		<description>Itadaki Street 2 - Neon Sign wa Barairo ni (Jpn)</description>
+		<description>Itadaki Street 2 - Neon Sign wa Barairo ni (Japan)</description>
 		<year>1994</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-I2" />
@@ -15979,7 +15979,7 @@ more investigation needed...
 	</software>
 
 	<software name="itoibass" supported="partial"> <!-- unemulated additional hardware (BSX) -->
-		<description>Itoi Shigesato no Bass Tsuri No. 1 (Jpn)</description>
+		<description>Itoi Shigesato no Bass Tsuri No. 1 (Japan)</description>
 		<year>1997</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ZBPJ-JPN" />
@@ -16022,7 +16022,7 @@ more investigation needed...
 	</software>
 <!-- wip-j -->
 	<software name="jl96drem" supported="partial">
-		<description>J.League '96 Dream Stadium (Jpn)</description>
+		<description>J.League '96 Dream Stadium (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AJ6J-JPN" />
@@ -16048,7 +16048,7 @@ more investigation needed...
 	</software>
 
 	<software name="jlexct94a" cloneof="sshotout">
-		<description>J.League Excite Stage '94 (Jpn)</description>
+		<description>J.League Excite Stage '94 (Japan)</description>
 		<year>1994</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-JL" />
@@ -16087,7 +16087,7 @@ more investigation needed...
 	</software>
 
 	<software name="jlexct95">
-		<description>J.League Excite Stage '95 (Jpn)</description>
+		<description>J.League Excite Stage '95 (Japan)</description>
 		<year>1995</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-AJ2J-JPN" />
@@ -16116,7 +16116,7 @@ more investigation needed...
 	</software>
 
 	<software name="jlprimea" cloneof="jlprime">
-		<description>J.League Soccer Prime Goal (Jpn)</description>
+		<description>J.League Soccer Prime Goal (Japan)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-JE" />
@@ -16138,7 +16138,7 @@ more investigation needed...
 	</software>
 
 	<software name="jlprime">
-		<description>J.League Soccer Prime Goal (Jpn, Rev. A)</description>
+		<description>J.League Soccer Prime Goal (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-JE" />
@@ -16161,7 +16161,7 @@ more investigation needed...
 	</software>
 
 	<software name="jlprime2">
-		<description>J.League Soccer Prime Goal 2 (Jpn)</description>
+		<description>J.League Soccer Prime Goal 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-2H" />
@@ -16186,7 +16186,7 @@ more investigation needed...
 	</software>
 
 	<software name="jlprime3" cloneof="90minute">
-		<description>J.League Soccer Prime Goal 3 (Jpn)</description>
+		<description>J.League Soccer Prime Goal 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-AJ3J-JPN" />
@@ -16213,7 +16213,7 @@ more investigation needed...
 	</software>
 
 	<software name="jlssocr">
-		<description>J.League Super Soccer (Jpn)</description>
+		<description>J.League Super Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-VX" />
@@ -16241,7 +16241,7 @@ more investigation needed...
 	</software>
 
 	<software name="jlssoc95">
-		<description>J.League Super Soccer '95 - Jikkyou Stadium (Jpn)</description>
+		<description>J.League Super Soccer '95 - Jikkyou Stadium (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AJSJ-JPN, SHVC-AJSJ-JPN-1" />
@@ -16267,7 +16267,7 @@ more investigation needed...
 	</software>
 
 	<software name="bigrun">
-		<description>Jaleco Rally Big Run - The Supreme 4WD Challenge (Jpn)</description>
+		<description>Jaleco Rally Big Run - The Supreme 4WD Challenge (Japan)</description>
 		<year>1991</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-BR" />
@@ -16307,7 +16307,7 @@ more investigation needed...
 	</software>
 
 	<software name="jbsuperb">
-		<description>JB The Super Bass (Jpn)</description>
+		<description>JB The Super Bass (Japan)</description>
 		<year>1995</year>
 		<publisher>N&amp;G Project</publisher>
 		<info name="serial" value="SHVC-A94J-JPN" />
@@ -16335,7 +16335,7 @@ more investigation needed...
 	</software>
 
 	<software name="jikkwres">
-		<description>Jikkyou Power Pro Wrestling '96 - Max Voltage (Jpn)</description>
+		<description>Jikkyou Power Pro Wrestling '96 - Max Voltage (Japan)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AJXJ-JPN" />
@@ -16362,7 +16362,7 @@ more investigation needed...
 	</software>
 
 	<software name="powyak98">
-		<description>Jikkyou Powerful Pro Yakyuu - Basic Ban '98 (Jpn)</description>
+		<description>Jikkyou Powerful Pro Yakyuu - Basic Ban '98 (Japan)</description>
 		<year>1998</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AJ5J-JPN / RS059-J1" />
@@ -16389,7 +16389,7 @@ more investigation needed...
 	</software>
 
 	<software name="powyak2b" cloneof="powyak2">
-		<description>Jikkyou Powerful Pro Yakyuu 2 (Jpn)</description>
+		<description>Jikkyou Powerful Pro Yakyuu 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AP2J-JPN" />
@@ -16418,7 +16418,7 @@ more investigation needed...
 	</software>
 
 	<software name="powyak3">
-		<description>Jikkyou Powerful Pro Yakyuu 3 (Jpn)</description>
+		<description>Jikkyou Powerful Pro Yakyuu 3 (Japan)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-A3JJ-JPN" />
@@ -16445,7 +16445,7 @@ more investigation needed...
 	</software>
 
 	<software name="powyak3a" cloneof="powyak3">
-		<description>Jikkyou Powerful Pro Yakyuu 3 (Jpn, alt)</description>
+		<description>Jikkyou Powerful Pro Yakyuu 3 (Japan, alt)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-A3JJ-JPN" />
@@ -16474,7 +16474,7 @@ more investigation needed...
 	</software>
 
 	<software name="powyk397a" cloneof="powyk397">
-		<description>Jikkyou Powerful Pro Yakyuu 3 - '97 Haru (Jpn)</description>
+		<description>Jikkyou Powerful Pro Yakyuu 3 - '97 Haru (Japan)</description>
 		<year>1997</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AQ7J-JPN" />
@@ -16501,7 +16501,7 @@ more investigation needed...
 	</software>
 
 	<software name="powyak94">
-		<description>Jikkyou Powerful Pro Yakyuu '94 (Jpn)</description>
+		<description>Jikkyou Powerful Pro Yakyuu '94 (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-YX" />
@@ -16523,7 +16523,7 @@ more investigation needed...
 	</software>
 
 	<software name="powyak96a" cloneof="powyak96">
-		<description>Jikkyou Powerful Pro Yakyuu '96 - Kaimaku Ban (Jpn)</description>
+		<description>Jikkyou Powerful Pro Yakyuu '96 - Kaimaku Ban (Japan)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-A57J-JPN" />
@@ -16550,7 +16550,7 @@ more investigation needed...
 	</software>
 
 	<software name="powyak96">
-		<description>Jikkyou Powerful Pro Yakyuu '96 - Kaimaku Ban (Jpn, Rev. A)</description>
+		<description>Jikkyou Powerful Pro Yakyuu '96 - Kaimaku Ban (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-A57J-JPN" />
@@ -16578,7 +16578,7 @@ more investigation needed...
 	</software>
 
 	<software name="jikksocra" cloneof="jikksocr">
-		<description>Jikkyou World Soccer - Perfect Eleven (Jpn)</description>
+		<description>Jikkyou World Soccer - Perfect Eleven (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-3U" />
@@ -16605,7 +16605,7 @@ more investigation needed...
 	</software>
 
 	<software name="jikksocr">
-		<description>Jikkyou World Soccer - Perfect Eleven (Jpn, Rev. A)</description>
+		<description>Jikkyou World Soccer - Perfect Eleven (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-3U" />
@@ -16633,7 +16633,7 @@ more investigation needed...
 	</software>
 
 	<software name="jikkscr2a" cloneof="jikkscr2">
-		<description>Jikkyou World Soccer 2 - Fighting Eleven (Jpn)</description>
+		<description>Jikkyou World Soccer 2 - Fighting Eleven (Japan)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AWJJ-JPN" />
@@ -16662,7 +16662,7 @@ more investigation needed...
 	</software>
 
 	<software name="connorsg" cloneof="connors">
-		<description>Jimmy Connors Pro Tennis Tour (Ger)</description>
+		<description>Jimmy Connors Pro Tennis Tour (Germany)</description>
 		<year>1992</year>
 		<publisher>Ubi Soft</publisher>
 		<info name="serial" value="SNSP-JC-NOE/SFRG" />
@@ -16681,7 +16681,7 @@ more investigation needed...
 	</software>
 
 	<software name="jpsloth">
-		<description>Jissen! Pachi-Slot Hisshouhou! (Jpn)</description>
+		<description>Jissen! Pachi-Slot Hisshouhou! (Japan)</description>
 		<year>1993</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-PI" />
@@ -16708,7 +16708,7 @@ more investigation needed...
 	</software>
 
 	<software name="jpsloth2">
-		<description>Jissen! Pachi-Slot Hisshouhou! 2 (Jpn)</description>
+		<description>Jissen! Pachi-Slot Hisshouhou! 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-XU" />
@@ -16735,7 +16735,7 @@ more investigation needed...
 	</software>
 
 	<software name="joushomj" supported="partial">
-		<description>Joushou Mahjong Tenpai (Jpn)</description>
+		<description>Joushou Mahjong Tenpai (Japan)</description>
 		<year>1995</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-ZTMJ-JPN" />
@@ -16831,7 +16831,7 @@ more investigation needed...
 	</software>
 
 	<software name="jungletc">
-		<description>Jungle no Ouja Tar-chan - Sekaimanyuu Daikakutou no Maki (Jpn)</description>
+		<description>Jungle no Ouja Tar-chan - Sekaimanyuu Daikakutou no Maki (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-5J" />
@@ -16915,7 +16915,7 @@ more investigation needed...
 	</software>
 
 	<software name="juteisen">
-		<description>Jutei Senki (Jpn)</description>
+		<description>Jutei Senki (Japan)</description>
 		<year>1993</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-JU" />
@@ -16943,7 +16943,7 @@ more investigation needed...
 	</software>
 <!-- wip-k -->
 	<software name="kachiuma">
-		<description>Kachiuma Yosou Soft - Baken Renkinjutsu (Jpn)</description>
+		<description>Kachiuma Yosou Soft - Baken Renkinjutsu (Japan)</description>
 		<year>1994</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-4K" />
@@ -16969,7 +16969,7 @@ more investigation needed...
 	</software>
 
 	<software name="dezaemon">
-		<description>Kaite Tsukutte Asoberu Dezaemon (Jpn)</description>
+		<description>Kaite Tsukutte Asoberu Dezaemon (Japan)</description>
 		<year>1994</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-66" />
@@ -16996,7 +16996,7 @@ more investigation needed...
 	</software>
 
 	<software name="kamaita">
-		<description>Kamaitachi no Yoru (Jpn)</description>
+		<description>Kamaitachi no Yoru (Japan)</description>
 		<year>1994</year>
 		<publisher>Chunsoft</publisher>
 		<info name="serial" value="SHVC-EU" />
@@ -17022,7 +17022,7 @@ more investigation needed...
 	</software>
 
 	<software name="kamaita1" cloneof="kamaita">
-		<description>Kamaitachi no Yoru (Jpn, alt)</description>
+		<description>Kamaitachi no Yoru (Japan, alt)</description>
 		<year>1994</year>
 		<publisher>Chunsoft</publisher>
 		<info name="serial" value="SHVC-EU" />
@@ -17050,7 +17050,7 @@ more investigation needed...
 	</software>
 
 	<software name="kawanus2">
-		<description>Kawa no Nushi Tsuri 2 (Jpn)</description>
+		<description>Kawa no Nushi Tsuri 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-AKNJ-JPN" />
@@ -17098,7 +17098,7 @@ more investigation needed...
 	</software>
 
 	<software name="keiba8s2">
-		<description>Keiba Eight Special 2 (Jpn)</description>
+		<description>Keiba Eight Special 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-82" />
@@ -17178,7 +17178,7 @@ more investigation needed...
 
 	<software name="dokapon4">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Kessen! Dokapon Oukoku IV - Densetsu no Yuusha-tachi (Jpn)</description>
+		<description>Kessen! Dokapon Oukoku IV - Densetsu no Yuusha-tachi (Japan)</description>
 		<year>1993</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-IX" />
@@ -17205,7 +17205,7 @@ more investigation needed...
 	</software>
 
 	<software name="gndmxdim">
-		<description>Kidou Senshi Gundam - Cross Dimension 0079 (Jpn)</description>
+		<description>Kidou Senshi Gundam - Cross Dimension 0079 (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-78" />
@@ -17233,7 +17233,7 @@ more investigation needed...
 	</software>
 
 	<software name="gndmf91">
-		<description>Kidou Senshi Gundam F91 - Formula Senki 0122 (Jpn)</description>
+		<description>Kidou Senshi Gundam F91 - Formula Senki 0122 (Japan)</description>
 		<year>1991</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-GP" />
@@ -17259,7 +17259,7 @@ more investigation needed...
 	</software>
 
 	<software name="vgundam">
-		<description>Kidou Senshi V Gundam (Jpn)</description>
+		<description>Kidou Senshi V Gundam (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-VU" />
@@ -17384,7 +17384,7 @@ more investigation needed...
 	</software>
 
 	<software name="kotmj" cloneof="kotm">
-		<description>King of the Monsters (Jpn)</description>
+		<description>King of the Monsters (Japan)</description>
 		<year>1992</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-KM" />
@@ -17405,7 +17405,7 @@ more investigation needed...
 	</software>
 
 	<software name="kotm2j" cloneof="kotm2">
-		<description>King of the Monsters 2 - The Next Thing (Jpn)</description>
+		<description>King of the Monsters 2 - The Next Thing (Japan)</description>
 		<year>1993</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-KT" />
@@ -17429,7 +17429,7 @@ more investigation needed...
 	</software>
 
 	<software name="kirbybow" cloneof="kirbydc">
-		<description>Kirby Bowl (Jpn)</description>
+		<description>Kirby Bowl (Japan)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-CG" />
@@ -17553,7 +17553,7 @@ more investigation needed...
 	</software>
 
 	<software name="kishinko">
-		<description>Kishin Kourinden Oni (Jpn)</description>
+		<description>Kishin Kourinden Oni (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-HD" />
@@ -17581,7 +17581,7 @@ more investigation needed...
 	</software>
 
 	<software name="villgust">
-		<description>Kouryuu Densetsu Villgust - Kieta Shoujo (Jpn)</description>
+		<description>Kouryuu Densetsu Villgust - Kieta Shoujo (Japan)</description>
 		<year>1992</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-VL" />
@@ -17607,7 +17607,7 @@ more investigation needed...
 	</software>
 
 	<software name="koryuki" cloneof="risephnx">
-		<description>Kouryuuki (Jpn)</description>
+		<description>Kouryuuki (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-QG" />
@@ -17635,7 +17635,7 @@ more investigation needed...
 	</software>
 
 	<software name="kousoku">
-		<description>Kousoku Shikou Shougi Ou (Jpn)</description>
+		<description>Kousoku Shikou Shougi Ou (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-ASGJ-JPN" />
@@ -17702,7 +17702,7 @@ more investigation needed...
 
 
 	<software name="lasvegas" cloneof="vegastak">
-		<description>Las Vegas Dream in Golden Paradise (Jpn)</description>
+		<description>Las Vegas Dream in Golden Paradise (Japan)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-L6" />
@@ -17728,7 +17728,7 @@ more investigation needed...
 	</software>
 
 	<software name="lastbib3">
-		<description>Last Bible III (Jpn)</description>
+		<description>Last Bible III (Japan)</description>
 		<year>1995</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ALBJ-JPN" />
@@ -17776,7 +17776,7 @@ more investigation needed...
 	</software>
 
 	<software name="mystninjg" cloneof="mystninj">
-		<description>The Legend of the Mystical Ninja (Ger)</description>
+		<description>The Legend of the Mystical Ninja (Germany)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SNSP-GG-NOE/SFRG" />
@@ -17839,7 +17839,7 @@ more investigation needed...
 	</software>
 
 	<software name="zelda3g" cloneof="zelda3">
-		<description>The Legend of Zelda - A Link to the Past (Ger)</description>
+		<description>The Legend of Zelda - A Link to the Past (Germany)</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-ZL-NOE/SFRG" />
@@ -17864,7 +17864,7 @@ more investigation needed...
 	</software>
 
 	<software name="zelda3f" cloneof="zelda3">
-		<description>The Legend of Zelda - A Link to the Past (Fra)</description>
+		<description>The Legend of Zelda - A Link to the Past (France)</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-ZL-FRA/SFRA" />
@@ -17927,7 +17927,7 @@ more investigation needed...
 	</software>
 
 	<software name="lemmingsj" cloneof="lemmings">
-		<description>Lemmings (Jpn)</description>
+		<description>Lemmings (Japan)</description>
 		<year>1991</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-LE" />
@@ -17973,7 +17973,7 @@ more investigation needed...
 
 	<software name="lennus" cloneof="paladin">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Lennus - Kodai Kikai no Kioku (Jpn)</description>
+		<description>Lennus - Kodai Kikai no Kioku (Japan)</description>
 		<year>1992</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-LN" />
@@ -18001,7 +18001,7 @@ more investigation needed...
 	</software>
 
 	<software name="lennus2">
-		<description>Lennus II - Fuuin no Shito (Jpn)</description>
+		<description>Lennus II - Fuuin no Shito (Japan)</description>
 		<year>1996</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-ALNJ-JPN" />
@@ -18047,7 +18047,7 @@ more investigation needed...
 	</software>
 
 	<software name="lethalenj" cloneof="lethalen">
-		<description>Lethal Enforcers (Jpn)</description>
+		<description>Lethal Enforcers (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-LK" />
@@ -18160,7 +18160,7 @@ more investigation needed...
 	</software>
 
 	<software name="livealiv">
-		<description>Live A Live (Jpn)</description>
+		<description>Live A Live (Japan)</description>
 		<year>1994</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-5V" />
@@ -18253,7 +18253,7 @@ more investigation needed...
 	</software>
 
 	<software name="lostvikg" cloneof="lostvik">
-		<description>The Lost Vikings (Ger)</description>
+		<description>The Lost Vikings (Germany)</description>
 		<year>1993</year>
 		<publisher>Interplay</publisher>
 		<info name="serial" value="SNSP-LV-NOE/SFRG" />
@@ -18322,7 +18322,7 @@ more investigation needed...
 	</software>
 
 	<software name="lufia2g" cloneof="lufia2">
-		<description>Lufia (Ger)</description>
+		<description>Lufia (Germany)</description>
 		<year>1996</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="SNSP-ANID-NOE" />
@@ -18441,7 +18441,7 @@ more investigation needed...
 	</software>
 
 	<software name="magswordj" cloneof="magsword">
-		<description>Magic Sword (Jpn)</description>
+		<description>Magic Sword (Japan)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-MD" />
@@ -18462,7 +18462,7 @@ more investigation needed...
 	</software>
 
 	<software name="mtaruru">
-		<description>Magical Taruruuto-kun - Magic Adventure (Jpn)</description>
+		<description>Magical Taruruuto-kun - Magic Adventure (Japan)</description>
 		<year>1992</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-TL" />
@@ -18488,7 +18488,7 @@ more investigation needed...
 	</software>
 
 	<software name="mjtaika2a" cloneof="mjtaika2">
-		<description>Mahjong Taikai II (Jpn)</description>
+		<description>Mahjong Taikai II (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AIQJ-JPN" />
@@ -18514,7 +18514,7 @@ more investigation needed...
 	</software>
 
 	<software name="guruguru">
-		<description>Mahoujin Guruguru (Jpn)</description>
+		<description>Mahoujin Guruguru (Japan)</description>
 		<year>1995</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AGUJ-JPN" />
@@ -18540,7 +18540,7 @@ more investigation needed...
 	</software>
 
 	<software name="gurugur2">
-		<description>Mahoujin Guruguru 2 (Jpn)</description>
+		<description>Mahoujin Guruguru 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-A99J-JPN" />
@@ -18566,7 +18566,7 @@ more investigation needed...
 	</software>
 
 	<software name="majtnseib" cloneof="majtnsei">
-		<description>Majin Tensei (Jpn)</description>
+		<description>Majin Tensei (Japan)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ZM" />
@@ -18595,7 +18595,7 @@ more investigation needed...
 	</software>
 
 	<software name="mariomisg" cloneof="mariomis">
-		<description>Mario is Missing! (Ger)</description>
+		<description>Mario is Missing! (Germany)</description>
 		<year>1993</year>
 		<publisher>The Software Toolworks</publisher>
 		<info name="serial" value="SNSP-MU-NOE/SFRG" />
@@ -18634,7 +18634,7 @@ more investigation needed...
 	</software>
 
 	<software name="mariopic">
-		<description>Mario no Super Picross (Jpn)</description>
+		<description>Mario no Super Picross (Japan)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ACXJ-JPN / G739139" />
@@ -18685,7 +18685,7 @@ more investigation needed...
 	</software>
 
 	<software name="mariopntu" cloneof="mariopnt">
-		<description>Mario Paint (Jpn, USA)</description>
+		<description>Mario Paint (Japan, USA)</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNS-MP-USA, SNS-MP-USA-1 (PCMS), SHVC-MP" />
@@ -18723,7 +18723,7 @@ more investigation needed...
 	</software>
 
 	<software name="mariowar">
-		<description>Mario &amp; Wario (Jpn)</description>
+		<description>Mario &amp; Wario (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-WE" />
@@ -18744,7 +18744,7 @@ more investigation needed...
 	</software>
 
 	<software name="mariowara" cloneof="mariowar">
-		<description>Mario &amp; Wario (Jpn, alt)</description>
+		<description>Mario &amp; Wario (Japan, alt)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-WE" />
@@ -18768,7 +18768,7 @@ more investigation needed...
 	</software>
 
 	<software name="haruaug2">
-		<description>Masters - Harukanaru Augusta 2 (Jpn)</description>
+		<description>Masters - Harukanaru Augusta 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-O2" />
@@ -18796,7 +18796,7 @@ more investigation needed...
 	</software>
 
 	<software name="haruaug3a" cloneof="haruaug3" supported="partial">
-		<description>Masters New - Harukanaru Augusta 3 (Jpn)</description>
+		<description>Masters New - Harukanaru Augusta 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-AO3J-JPN" />
@@ -18822,7 +18822,7 @@ more investigation needed...
 	</software>
 
 	<software name="suprtraw">
-		<description>Matsukata Hiroki no Super Trawling (Jpn)</description>
+		<description>Matsukata Hiroki no Super Trawling (Japan)</description>
 		<year>1995</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-AMVJ-JPN" />
@@ -18849,7 +18849,7 @@ more investigation needed...
 	</software>
 
 	<software name="mazinger">
-		<description>Mazinger Z (Jpn)</description>
+		<description>Mazinger Z (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-JZ" />
@@ -18940,7 +18940,7 @@ more investigation needed...
 	</software>
 
 	<software name="megaloj" cloneof="megalo">
-		<description>Mega Lo Mania (Jpn)</description>
+		<description>Mega Lo Mania (Japan)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-MZ" />
@@ -19057,7 +19057,7 @@ more investigation needed...
 	</software>
 
 	<software name="mmaniaj" cloneof="mmania">
-		<description>Mickey Mania - The Timeless Adventures of Mickey Mouse (Jpn)</description>
+		<description>Mickey Mania - The Timeless Adventures of Mickey Mouse (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AMIJ-JPN" />
@@ -19098,7 +19098,7 @@ more investigation needed...
 	</software>
 
 	<software name="mickeym1a" cloneof="mickeymq">
-		<description>Mickey no Magical Adventure (Jpn)</description>
+		<description>Mickey no Magical Adventure (Japan)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-MI" />
@@ -19119,7 +19119,7 @@ more investigation needed...
 	</software>
 
 	<software name="mickeym1" cloneof="mickeymq">
-		<description>Mickey no Magical Adventure (Jpn, Rev. A)</description>
+		<description>Mickey no Magical Adventure (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-MI" />
@@ -19141,7 +19141,7 @@ more investigation needed...
 	</software>
 
 	<software name="mickeym2" cloneof="mickeycm">
-		<description>Mickey to Minnie - Magical Adventure 2 (Jpn)</description>
+		<description>Mickey to Minnie - Magical Adventure 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-4C" />
@@ -19184,7 +19184,7 @@ more investigation needed...
 	</software>
 
 	<software name="mightmg2g" cloneof="mightmg2">
-		<description>Might and Magic II - Gates to Another World (Ger)</description>
+		<description>Might and Magic II - Gates to Another World (Germany)</description>
 		<year>1993</year>
 		<publisher>Elite System</publisher>
 		<info name="serial" value="SNSP-MG-NOE/SFRG" />
@@ -19208,7 +19208,7 @@ more investigation needed...
 	</software>
 
 	<software name="militia" cloneof="metalmar">
-		<description>Militia (Jpn)</description>
+		<description>Militia (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-NG" />
@@ -19234,7 +19234,7 @@ more investigation needed...
 
 	<software name="miniynk2">
 		<!-- Notes: Re-released on a retail cart after initial release on Nintendo Power (19981001) -->
-		<description>Mini Yonku Let's &amp; Go!! - Power WGP 2 (Jpn)</description>
+		<description>Mini Yonku Let's &amp; Go!! - Power WGP 2 (Japan)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BM4J-JPN" />
@@ -19260,7 +19260,7 @@ more investigation needed...
 	</software>
 
 	<software name="miniyonk">
-		<description>Mini Yonku Shining Scorpion - Let's &amp; Go!! (Jpn)</description>
+		<description>Mini Yonku Shining Scorpion - Let's &amp; Go!! (Japan)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-A4WJ-JPN" />
@@ -19305,7 +19305,7 @@ more investigation needed...
 	</software>
 
 	<software name="momodhap">
-		<description>Momotarou Dentetsu Happy (Jpn)</description>
+		<description>Momotarou Dentetsu Happy (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AH8J-JPN" />
@@ -19335,7 +19335,7 @@ more investigation needed...
 	</software>
 
 	<software name="monopolyj" cloneof="monopoly">
-		<description>Monopoly (Jpn)</description>
+		<description>Monopoly (Japan)</description>
 		<year>1993</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-ML" />
@@ -19394,7 +19394,7 @@ more investigation needed...
 	</software>
 
 	<software name="monopol2">
-		<description>The Monopoly Game 2 (Jpn)</description>
+		<description>The Monopoly Game 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-AMLJ-JPN" />
@@ -19570,7 +19570,7 @@ more investigation needed...
 	</software>
 
 	<software name="mother2" cloneof="earthbnd">
-		<description>Mother 2 - Gyiyg no Gyakushuu (Jpn)</description>
+		<description>Mother 2 - Gyiyg no Gyakushuu (Japan)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-MB / G723109" />
@@ -19599,7 +19599,7 @@ more investigation needed...
 	</software>
 
 	<software name="madara2">
-		<description>Mouryou Senki Madara 2 (Jpn)</description>
+		<description>Mouryou Senki Madara 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-M2" />
@@ -19646,7 +19646,7 @@ more investigation needed...
 	</software>
 
 	<software name="mbomber" cloneof="slammast">
-		<description>Muscle Bomber - The Body Explosion (Jpn)</description>
+		<description>Muscle Bomber - The Body Explosion (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-ZW" />
@@ -19670,7 +19670,7 @@ more investigation needed...
 	</software>
 
 	<software name="mysticar">
-		<description>Mystic Ark (Jpn)</description>
+		<description>Mystic Ark (Japan)</description>
 		<year>1995</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AEAJ-JPN" />
@@ -19696,7 +19696,7 @@ more investigation needed...
 	</software>
 
 	<software name="mquestg" cloneof="mquest">
-		<description>Mystic Quest Legend (Ger)</description>
+		<description>Mystic Quest Legend (Germany)</description>
 		<year>1992</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SNSP-MQ-NOE/SFRG" />
@@ -19720,7 +19720,7 @@ more investigation needed...
 	</software>
 <!-- wip-n -->
 	<software name="nakano">
-		<description>Nakano Kouichi Kanshuu Keirin Ou (Jpn)</description>
+		<description>Nakano Kouichi Kanshuu Keirin Ou (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-OU" />
@@ -19747,7 +19747,7 @@ more investigation needed...
 
 	<software name="namcotop">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Namcot Open (Jpn)</description>
+		<description>Namcot Open (Japan)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-NO" />
@@ -19773,7 +19773,7 @@ more investigation needed...
 	</software>
 
 	<software name="naruhodo">
-		<description>Naruhodo! The World (Jpn)</description>
+		<description>Naruhodo! The World (Japan)</description>
 		<year>1994</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-QV" />
@@ -19966,7 +19966,7 @@ more investigation needed...
 
 	<software name="n3dgdevi" cloneof="truewick">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>New 3D Golf Simulation - Devil's Course (Jpn)</description>
+		<description>New 3D Golf Simulation - Devil's Course (Japan)</description>
 		<year>1993</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-GT" />
@@ -19992,7 +19992,7 @@ more investigation needed...
 	</software>
 
 	<software name="n3dgaugua" cloneof="n3dgaugu">
-		<description>New 3D Golf Simulation - Harukanaru Augusta (Jpn, Rev. 0A)</description>
+		<description>New 3D Golf Simulation - Harukanaru Augusta (Japan, Rev. 0A)</description>
 		<year>1991</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-GA" />
@@ -20019,7 +20019,7 @@ more investigation needed...
 	</software>
 
 	<software name="n3dgaugu">
-		<description>New 3D Golf Simulation - Harukanaru Augusta (Jpn, Rev. B)</description>
+		<description>New 3D Golf Simulation - Harukanaru Augusta (Japan, Rev. B)</description>
 		<year>1991</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-GA" />
@@ -20046,7 +20046,7 @@ more investigation needed...
 	</software>
 
 	<software name="n3dgpebb" cloneof="truepebl">
-		<description>New 3D Golf Simulation - Pebble Beach no Hatou (Jpn)</description>
+		<description>New 3D Golf Simulation - Pebble Beach no Hatou (Japan)</description>
 		<year>1992</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-GB" />
@@ -20072,7 +20072,7 @@ more investigation needed...
 	</software>
 
 	<software name="n3dgwaia" cloneof="truewaia">
-		<description>New 3D Golf Simulation - Waialae no Kiseki (Jpn)</description>
+		<description>New 3D Golf Simulation - Waialae no Kiseki (Japan)</description>
 		<year>1992</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-GC" />
@@ -20098,7 +20098,7 @@ more investigation needed...
 	</software>
 
 	<software name="nflpro94" cloneof="madden94">
-		<description>NFL Pro Football '94 (Jpn)</description>
+		<description>NFL Pro Football '94 (Japan)</description>
 		<year>1993</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-9M" />
@@ -20122,7 +20122,7 @@ more investigation needed...
 	</software>
 
 	<software name="nflqb95">
-		<description>NFL Quarterback Club '95 (Jpn)</description>
+		<description>NFL Quarterback Club '95 (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-Q9" />
@@ -20309,7 +20309,7 @@ more investigation needed...
 	</software>
 
 	<software name="niceshot">
-		<description>Nice de Shot (Jpn)</description>
+		<description>Nice de Shot (Japan)</description>
 		<year>1994</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-NN" />
@@ -20337,7 +20337,7 @@ more investigation needed...
 	</software>
 
 	<software name="nichicl2">
-		<description>Nichibutsu Collection 2 (Jpn)</description>
+		<description>Nichibutsu Collection 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-A2BJ-JPN" />
@@ -20386,7 +20386,7 @@ more investigation needed...
 	</software>
 
 	<software name="mansellb" cloneof="mansell">
-		<description>Nigel Mansell's World Championship Racing (Ger)</description>
+		<description>Nigel Mansell's World Championship Racing (Germany)</description>
 		<year>1993</year>
 		<publisher>Gremlin Interactive</publisher>
 		<info name="serial" value="SNSP-NW-NOE" />
@@ -20491,7 +20491,7 @@ more investigation needed...
 	</software>
 
 	<software name="nipachim">
-		<description>Nishijin Pachinko Monogatari (Jpn)</description>
+		<description>Nishijin Pachinko Monogatari (Japan)</description>
 		<year>1995</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-ANPJ-JPN" />
@@ -20517,7 +20517,7 @@ more investigation needed...
 	</software>
 
 	<software name="nobuhao1" cloneof="nobuhao">
-		<description>Nobunaga no Yabou - Haouden (Jpn)</description>
+		<description>Nobunaga no Yabou - Haouden (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-NK" />
@@ -20543,7 +20543,7 @@ more investigation needed...
 	</software>
 
 	<software name="nobuhao">
-		<description>Nobunaga no Yabou - Haouden (Jpn, Rev. A)</description>
+		<description>Nobunaga no Yabou - Haouden (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-NK" />
@@ -20570,7 +20570,7 @@ more investigation needed...
 	</software>
 
 	<software name="nobutens">
-		<description>Nobunaga no Yabou - Tenshouki (Jpn)</description>
+		<description>Nobunaga no Yabou - Tenshouki (Japan)</description>
 		<year>1996</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AN6J-JPN" />
@@ -20596,7 +20596,7 @@ more investigation needed...
 	</software>
 <!-- wip-o -->
 	<software name="odanobu">
-		<description>Oda Nobunaga - Haou no Gundan (Jpn)</description>
+		<description>Oda Nobunaga - Haou no Gundan (Japan)</description>
 		<year>1993</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-ON" />
@@ -20622,7 +20622,7 @@ more investigation needed...
 	</software>
 
 	<software name="ongaku" supported="partial">
-		<description>Ongaku Tsukuru Kanadeeru (Jpn)</description>
+		<description>Ongaku Tsukuru Kanadeeru (Japan)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-ZMCJ-JPN" />
@@ -20648,7 +20648,7 @@ more investigation needed...
 	</software>
 
 	<software name="oomonobb" cloneof="fishmast">
-		<description>Oomono Black Bass Fishing - Jinzouko Hen (Jpn)</description>
+		<description>Oomono Black Bass Fishing - Jinzouko Hen (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AOAJ-JPN" />
@@ -20674,7 +20674,7 @@ more investigation needed...
 	</software>
 
 	<software name="oozumous">
-		<description>Oozumou Spirits (Jpn)</description>
+		<description>Oozumou Spirits (Japan)</description>
 		<year>1992</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-OZ" />
@@ -20720,7 +20720,7 @@ more investigation needed...
 	</software>
 
 	<software name="karatebu">
-		<description>Ossu!! Karate-bu (Jpn)</description>
+		<description>Ossu!! Karate-bu (Japan)</description>
 		<year>1994</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-OJ" />
@@ -20745,7 +20745,7 @@ more investigation needed...
 
 	<software name="otogiri">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Otogirisou (Jpn)</description>
+		<description>Otogirisou (Japan)</description>
 		<year>1992</year>
 		<publisher>Chunsoft</publisher>
 		<info name="serial" value="SHVC-OT" />
@@ -20800,7 +20800,7 @@ more investigation needed...
 	</software>
 <!-- wip-p -->
 	<software name="pslotlov">
-		<description>Pachi-Slot Love Story (Jpn)</description>
+		<description>Pachi-Slot Love Story (Japan)</description>
 		<year>1993</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-P5" />
@@ -20821,7 +20821,7 @@ more investigation needed...
 	</software>
 
 	<software name="pslotmu">
-		<description>Pachi-Slot Monogatari - Universal Special (Jpn)</description>
+		<description>Pachi-Slot Monogatari - Universal Special (Japan)</description>
 		<year>1994</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-9K" />
@@ -20842,7 +20842,7 @@ more investigation needed...
 	</software>
 
 	<software name="pachimon">
-		<description>Pachinko Monogatari - Pachi-Slot mo Aru deyo!! (Jpn)</description>
+		<description>Pachinko Monogatari - Pachi-Slot mo Aru deyo!! (Japan)</description>
 		<year>1993</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-KS" />
@@ -20863,7 +20863,7 @@ more investigation needed...
 	</software>
 
 	<software name="pachimo2">
-		<description>Pachinko Monogatari 2 - Nagoya Shachihoko no Teiou (Jpn)</description>
+		<description>Pachinko Monogatari 2 - Nagoya Shachihoko no Teiou (Japan)</description>
 		<year>1995</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-A2PJ-JPN" />
@@ -20887,7 +20887,7 @@ more investigation needed...
 	</software>
 
 	<software name="pachiwar">
-		<description>Pachinko Wars (Jpn)</description>
+		<description>Pachinko Wars (Japan)</description>
 		<year>1992</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-PC" />
@@ -20908,7 +20908,7 @@ more investigation needed...
 	</software>
 
 	<software name="pachikun">
-		<description>Pachio-kun Special (Jpn)</description>
+		<description>Pachio-kun Special (Japan)</description>
 		<year>1992</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-PA" />
@@ -20934,7 +20934,7 @@ more investigation needed...
 	</software>
 
 	<software name="pachikn2">
-		<description>Pachio-kun Special 2 (Jpn)</description>
+		<description>Pachio-kun Special 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-OC" />
@@ -20960,7 +20960,7 @@ more investigation needed...
 	</software>
 
 	<software name="pachiwa2">
-		<description>Pachinko Wars II (Jpn)</description>
+		<description>Pachinko Wars II (Japan)</description>
 		<year>1993</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-P6" />
@@ -21009,7 +21009,7 @@ more investigation needed...
 	</software>
 
 	<software name="panepon" cloneof="tetrisat">
-		<description>Panel de Pon (Jpn)</description>
+		<description>Panel de Pon (Japan)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-AYLJ-JPN" />
@@ -21049,7 +21049,7 @@ more investigation needed...
 	</software>
 
 	<software name="parlmin2">
-		<description>Parlor! Mini 2 - Pachinko Jikki Simulation Game (Jpn)</description>
+		<description>Parlor! Mini 2 - Pachinko Jikki Simulation Game (Japan)</description>
 		<year>1996</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQCJ-JPN" />
@@ -21070,7 +21070,7 @@ more investigation needed...
 	</software>
 
 	<software name="parlmini">
-		<description>Parlor! Mini - Pachinko Jikki Simulation Game (Jpn, Rev. A)</description>
+		<description>Parlor! Mini - Pachinko Jikki Simulation Game (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQAJ-JPN and SHVC-AQAJ-JPN-1" />
@@ -21092,7 +21092,7 @@ more investigation needed...
 	</software>
 
 	<software name="parlmin4">
-		<description>Parlor! Mini 4 - Pachinko Jikki Simulation Game (Jpn)</description>
+		<description>Parlor! Mini 4 - Pachinko Jikki Simulation Game (Japan)</description>
 		<year>1996</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQXJ-JPN" />
@@ -21113,7 +21113,7 @@ more investigation needed...
 	</software>
 
 	<software name="parlmin6">
-		<description>Parlor! Mini 6 - Pachinko Jikki Simulation Game (Jpn)</description>
+		<description>Parlor! Mini 6 - Pachinko Jikki Simulation Game (Japan)</description>
 		<year>1997</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQRJ-JPN" />
@@ -21134,7 +21134,7 @@ more investigation needed...
 	</software>
 
 	<software name="parlmin7">
-		<description>Parlor! Mini 7 - Pachinko Jikki Simulation Game (Jpn)</description>
+		<description>Parlor! Mini 7 - Pachinko Jikki Simulation Game (Japan)</description>
 		<year>1997</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQMJ-JPN" />
@@ -21156,7 +21156,7 @@ more investigation needed...
 
 	<software name="parlparl">
 		<!-- Alt. Title: 京楽 三洋 豊丸 Parlor ! パーラー! / Kyouraku - Sanyo - Toyomaru - Parlor! Parlor! (Box) -->
-		<description>Parlor! Parlor! (Jpn)</description>
+		<description>Parlor! Parlor! (Japan)</description>
 		<year>1995</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-APXJ-JPN" />
@@ -21183,7 +21183,7 @@ more investigation needed...
 
 	<software name="parlpar3">
 		<!-- Alt. Title: 京楽 三洋 豊丸 奥村 太陽 Parlor ! パー ラー!3 / Kyouraku - Sanyou - Toyomaru - Okumura - Taiyou - Parlor! Parlor! 3 (Box) -->
-		<description>Parlor! Parlor! 3 (Jpn)</description>
+		<description>Parlor! Parlor! 3 (Japan)</description>
 		<year>1996</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AYPJ-JPN" />
@@ -21231,7 +21231,7 @@ more investigation needed...
 
 	<software name="parodiusj" cloneof="parodius">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Parodius Da! - Shinwa kara Owarai e (Jpn)</description>
+		<description>Parodius Da! - Shinwa kara Owarai e (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-PD" />
@@ -21252,7 +21252,7 @@ more investigation needed...
 	</software>
 
 	<software name="pebble" supported="partial">
-		<description>Pebble Beach no Hatou New - Tournament Edition (Jpn)</description>
+		<description>Pebble Beach no Hatou New - Tournament Edition (Japan)</description>
 		<year>1996</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-AONJ-JPN" />
@@ -21353,7 +21353,7 @@ more investigation needed...
 	</software>
 
 	<software name="pilotwinj" cloneof="pilotwin">
-		<description>Pilotwings (Jpn)</description>
+		<description>Pilotwings (Japan)</description>
 		<year>1990</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-PW" />
@@ -21487,7 +21487,7 @@ more investigation needed...
 	</software>
 
 	<software name="plokf" cloneof="plok">
-		<description>Plok! (Fra)</description>
+		<description>Plok! (France)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-P4-FAH/SFRA" />
@@ -21507,7 +21507,7 @@ more investigation needed...
 	</software>
 
 	<software name="plokg" cloneof="plok">
-		<description>Plok! (Ger)</description>
+		<description>Plok! (Germany)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-P4-NOE/SFRG" />
@@ -21551,7 +21551,7 @@ more investigation needed...
 
 	<software name="popntwinj" cloneof="popntwin">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Pop'n TwinBee (Jpn)</description>
+		<description>Pop'n TwinBee (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-PT" />
@@ -21572,7 +21572,7 @@ more investigation needed...
 	</software>
 
 	<software name="populousj" cloneof="populous">
-		<description>Populous (Jpn)</description>
+		<description>Populous (Japan)</description>
 		<year>1990</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-PO" />
@@ -21598,7 +21598,7 @@ more investigation needed...
 	</software>
 
 	<software name="populus2j" cloneof="populus2">
-		<description>Populous II - Trials of the Olympian Gods (Jpn)</description>
+		<description>Populous II - Trials of the Olympian Gods (Japan)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-PL" />
@@ -21642,7 +21642,7 @@ more investigation needed...
 	</software>
 
 	<software name="powerhir">
-		<description>Power of the Hired (Jpn)</description>
+		<description>Power of the Hired (Japan)</description>
 		<year>1994</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-ALUJ-JPN" />
@@ -21715,7 +21715,7 @@ more investigation needed...
 
 	<software name="powrsoko">
 		<!-- Notes: Re-released on a retail cart (19990625) after initial release on Nintendo Power (19990101) -->
-		<description>Power Soukoban (Jpn)</description>
+		<description>Power Soukoban (Japan)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BPSJ-JPN" />
@@ -21741,7 +21741,7 @@ more investigation needed...
 	</software>
 
 	<software name="pmongerj" cloneof="pmonger">
-		<description>PowerMonger (Jpn)</description>
+		<description>PowerMonger (Japan)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-PM" />
@@ -21781,7 +21781,7 @@ more investigation needed...
 	</software>
 
 	<software name="ppersiaj" cloneof="ppersia">
-		<description>Prince of Persia (Jpn)</description>
+		<description>Prince of Persia (Japan)</description>
 		<year>1992</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-PR" />
@@ -21821,7 +21821,7 @@ more investigation needed...
 	</software>
 
 	<software name="profoot" cloneof="madden">
-		<description>Pro Football (Jpn)</description>
+		<description>Pro Football (Japan)</description>
 		<year>1992</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-FB" />
@@ -21842,7 +21842,7 @@ more investigation needed...
 	</software>
 
 	<software name="mjkiwamea" cloneof="mjkiwame">
-		<description>Pro Mahjong Kiwame (Jpn)</description>
+		<description>Pro Mahjong Kiwame (Japan)</description>
 		<year>1993</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-ZZ" />
@@ -21863,7 +21863,7 @@ more investigation needed...
 	</software>
 
 	<software name="mjkiwam3">
-		<description>Pro Mahjong Kiwame III (Jpn)</description>
+		<description>Pro Mahjong Kiwame III (Japan)</description>
 		<year>1995</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-AZ3J-JPN" />
@@ -21889,7 +21889,7 @@ more investigation needed...
 	</software>
 
 	<software name="prosoccr" cloneof="wlsoccer">
-		<description>Pro Soccer (Jpn)</description>
+		<description>Pro Soccer (Japan)</description>
 		<year>1991</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-PS" />
@@ -21915,7 +21915,7 @@ more investigation needed...
 	</software>
 
 	<software name="prostar">
-		<description>Pro Yakyuu Star (Jpn)</description>
+		<description>Pro Yakyuu Star (Japan)</description>
 		<year>1997</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-AU4J-JPN" />
@@ -21941,7 +21941,7 @@ more investigation needed...
 	</software>
 
 	<software name="psychodr">
-		<description>Psycho Dream (Jpn)</description>
+		<description>Psycho Dream (Japan)</description>
 		<year>1992</year>
 		<publisher>Riot</publisher>
 		<info name="serial" value="SHVC-PY" />
@@ -21962,7 +21962,7 @@ more investigation needed...
 	</software>
 
 	<software name="pbobblej" cloneof="pbobble">
-		<description>Puzzle Bobble (Jpn)</description>
+		<description>Puzzle Bobble (Japan)</description>
 		<year>1995</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-AYKJ-JPN" />
@@ -22045,7 +22045,7 @@ more investigation needed...
 	</software>
 
 	<software name="ranmaf" cloneof="ranma">
-		<description>Ranma ½ (Fra)</description>
+		<description>Ranma ½ (France)</description>
 		<year>1993</year>
 		<publisher>Ocean</publisher>
 		<info name="serial" value="SNSP-R2-FRA/SFRA" />
@@ -22067,7 +22067,7 @@ more investigation needed...
 	</software>
 
 	<software name="ranmabak">
-		<description>Ranma ½ - Bakuretsu Rantou Hen (Jpn)</description>
+		<description>Ranma ½ - Bakuretsu Rantou Hen (Japan)</description>
 		<year>1992</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-R2" />
@@ -22091,7 +22091,7 @@ more investigation needed...
 	</software>
 
 	<software name="ranmagek" cloneof="scombat">
-		<description>Ranma ½ - Chounai Gekitou Hen (Jpn)</description>
+		<description>Ranma ½ - Chounai Gekitou Hen (Japan)</description>
 		<year>1992</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-RA" />
@@ -22112,7 +22112,7 @@ more investigation needed...
 	</software>
 
 	<software name="shushoku">
-		<description>Recruit Simulation - Shuushoku Game - Trendy Drama (Jpn)</description>
+		<description>Recruit Simulation - Shuushoku Game - Trendy Drama (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AIMJ-JPN" />
@@ -22160,7 +22160,7 @@ more investigation needed...
 	</software>
 
 	<software name="resarcan">
-		<description>Res Arcana - Diana Ray - Uranai no Meikyuu (Jpn)</description>
+		<description>Res Arcana - Diana Ray - Uranai no Meikyuu (Japan)</description>
 		<year>1995</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-ARAJ-JPN" />
@@ -22245,7 +22245,7 @@ more investigation needed...
 	</software>
 
 	<software name="roadrunnj" cloneof="roadrunn">
-		<description>Looney Tunes Road Runner vs Wile E. Coyote (Jpn)</description>
+		<description>Looney Tunes Road Runner vs Wile E. Coyote (Japan)</description>
 		<year>1992</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-DV" />
@@ -22373,7 +22373,7 @@ more investigation needed...
 	</software>
 
 	<software name="rnrracinj" cloneof="rnrracin">
-		<description>Rock n' Roll Racing (Jpn)</description>
+		<description>Rock n' Roll Racing (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-RN" />
@@ -22415,7 +22415,7 @@ more investigation needed...
 	</software>
 
 	<software name="rockman7" cloneof="megaman7">
-		<description>Rockman 7 - Shukumei no Taiketsu! (Jpn)</description>
+		<description>Rockman 7 - Shukumei no Taiketsu! (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-A7RJ-JPN" />
@@ -22436,7 +22436,7 @@ more investigation needed...
 	</software>
 
 	<software name="rockmanf">
-		<description>Rockman &amp; Forte (Jpn)</description>
+		<description>Rockman &amp; Forte (Japan)</description>
 		<year>1998</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AR6J-JPN" />
@@ -22463,7 +22463,7 @@ more investigation needed...
 
 	<software name="rockmnxa" cloneof="megamnx">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Rockman X (Jpn)</description>
+		<description>Rockman X (Japan)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-RX" />
@@ -22487,7 +22487,7 @@ more investigation needed...
 	</software>
 
 	<software name="rockmnx2" cloneof="megamnx2">
-		<description>Rockman X2 (Jpn)</description>
+		<description>Rockman X2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-ARXJ-JPN" />
@@ -22515,7 +22515,7 @@ more investigation needed...
 	</software>
 
 	<software name="rockmnx3" cloneof="megamnx3">
-		<description>Rockman X3 (Jpn)</description>
+		<description>Rockman X3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AR3J-JPN" />
@@ -22541,7 +22541,7 @@ more investigation needed...
 	</software>
 
 	<software name="rockmans" cloneof="megamans">
-		<description>Rockman's Soccer (Jpn)</description>
+		<description>Rockman's Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-RQ" />
@@ -22588,7 +22588,7 @@ more investigation needed...
 	</software>
 
 	<software name="mvpbbj" cloneof="mvpbb">
-		<description>Roger Clemens' MVP Baseball (Jpn)</description>
+		<description>Roger Clemens' MVP Baseball (Japan)</description>
 		<year>1993</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-VP" />
@@ -22609,7 +22609,7 @@ more investigation needed...
 	</software>
 
 	<software name="rokudena">
-		<description>Rokudenashi Blues - Taiketsu! Tokyo Shitennou (Jpn)</description>
+		<description>Rokudenashi Blues - Taiketsu! Tokyo Shitennou (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-6X" />
@@ -22660,7 +22660,7 @@ more investigation needed...
 	</software>
 
 	<software name="romsagaa" cloneof="romsaga">
-		<description>Romancing Sa-Ga (Jpn)</description>
+		<description>Romancing Sa-Ga (Japan)</description>
 		<year>1992</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-RS" />
@@ -22686,7 +22686,7 @@ more investigation needed...
 	</software>
 
 	<software name="romsaga">
-		<description>Romancing Sa-Ga (Jpn, Rev. A)</description>
+		<description>Romancing Sa-Ga (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-RS" />
@@ -22713,7 +22713,7 @@ more investigation needed...
 	</software>
 
 	<software name="romsaga2">
-		<description>Romancing Sa-Ga 2 (Jpn)</description>
+		<description>Romancing Sa-Ga 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-2L" />
@@ -22740,7 +22740,7 @@ more investigation needed...
 	</software>
 
 	<software name="romsaga2a" cloneof="romsaga2">
-		<description>Romancing Sa-Ga 2 (Jpn, alt)</description>
+		<description>Romancing Sa-Ga 2 (Japan, alt)</description>
 		<year>1993</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-2L" />
@@ -22769,7 +22769,7 @@ more investigation needed...
 	</software>
 
 	<software name="romsaga3a" cloneof="romsaga3">
-		<description>Romancing Sa-Ga 3 (Jpn)</description>
+		<description>Romancing Sa-Ga 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AL3J-JPN" />
@@ -22796,7 +22796,7 @@ more investigation needed...
 	</software>
 
 	<software name="romsaga3">
-		<description>Romancing Sa-Ga 3 (Jpn, Rev. A)</description>
+		<description>Romancing Sa-Ga 3 (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AL3J-JPN" />
@@ -22824,7 +22824,7 @@ more investigation needed...
 	</software>
 
 	<software name="rpgtsuku">
-		<description>RPG Tsukuru - Super Dante (Jpn)</description>
+		<description>RPG Tsukuru - Super Dante (Japan)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-ARDJ-JPN" />
@@ -22850,7 +22850,7 @@ more investigation needed...
 	</software>
 
 	<software name="rpgtsuk2" supported="partial">
-		<description>RPG Tsukuru 2 (Jpn)</description>
+		<description>RPG Tsukuru 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-ZR2J-JPN" />
@@ -22876,7 +22876,7 @@ more investigation needed...
 	</software>
 
 	<software name="rudra">
-		<description>Rudra no Hihou (Jpn)</description>
+		<description>Rudra no Hihou (Japan)</description>
 		<year>1996</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AORJ-JPN" />
@@ -22925,7 +22925,7 @@ more investigation needed...
 	</software>
 
 	<software name="rushbeat" cloneof="rivaltrf">
-		<description>Rushing Beat (Jpn)</description>
+		<description>Rushing Beat (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-RB" />
@@ -22946,7 +22946,7 @@ more investigation needed...
 	</software>
 
 	<software name="ryukokena" cloneof="aof">
-		<description>Ryuuko no Ken (Jpn)</description>
+		<description>Ryuuko no Ken (Japan)</description>
 		<year>1993</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="SHVC-RW" />
@@ -22968,7 +22968,7 @@ more investigation needed...
 	</software>
 <!-- wip-s -->
 	<software name="sakurai">
-		<description>Sakurai Shouichi no Jankiryuu Mahjong Hisshouhou (Jpn)</description>
+		<description>Sakurai Shouichi no Jankiryuu Mahjong Hisshouhou (Japan)</description>
 		<year>1995</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AMZJ-JPN" />
@@ -22994,7 +22994,7 @@ more investigation needed...
 	</software>
 
 	<software name="samegame">
-		<description>Same Game (Jpn)</description>
+		<description>Same Game (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-ZS5J-JPN" />
@@ -23044,7 +23044,7 @@ more investigation needed...
 	</software>
 
 	<software name="samspir" cloneof="samsho">
-		<description>Samurai Spirits (Jpn)</description>
+		<description>Samurai Spirits (Japan)</description>
 		<year>1994</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-A7SJ-JPN" />
@@ -23069,7 +23069,7 @@ more investigation needed...
 	</software>
 
 	<software name="sangoku3a" cloneof="roman3k3">
-		<description>Sangokushi III (Jpn)</description>
+		<description>Sangokushi III (Japan)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-S3" />
@@ -23098,7 +23098,7 @@ more investigation needed...
 	</software>
 
 	<software name="sangoku4a" cloneof="roman3k4">
-		<description>Sangokushi IV (Jpn)</description>
+		<description>Sangokushi IV (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AS4J-JPN" />
@@ -23126,7 +23126,7 @@ more investigation needed...
 	</software>
 
 	<software name="sankyofv">
-		<description>Sankyo Fever! Fever! (Jpn)</description>
+		<description>Sankyo Fever! Fever! (Japan)</description>
 		<year>1994</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AFFJ-JPN" />
@@ -23147,7 +23147,7 @@ more investigation needed...
 	</software>
 
 	<software name="sanspo">
-		<description>Sanspo Fishing - Keiryuu Ou (Jpn)</description>
+		<description>Sanspo Fishing - Keiryuu Ou (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-IO" />
@@ -23240,7 +23240,7 @@ more investigation needed...
 	</software>
 
 	<software name="sdgungnx">
-		<description>SD Gundam G Next (Jpn)</description>
+		<description>SD Gundam G Next (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-ZX3J-JPN" />
@@ -23267,7 +23267,7 @@ more investigation needed...
 	</software>
 
 	<software name="kgundama" cloneof="kgundam">
-		<description>SD Gundam Gaiden - Knight Gundam Monogatari - Ooinaru Isan (Jpn)</description>
+		<description>SD Gundam Gaiden - Knight Gundam Monogatari - Ooinaru Isan (Japan)</description>
 		<year>1991</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-KG" />
@@ -23293,7 +23293,7 @@ more investigation needed...
 	</software>
 
 	<software name="sdgungx" supported="partial">
-		<description>SD Gundam GX (Jpn)</description>
+		<description>SD Gundam GX (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-X2" />
@@ -23325,7 +23325,7 @@ more investigation needed...
 	</software>
 
 	<software name="sdhiryu">
-		<description>SD Hiryuu no Ken (Jpn)</description>
+		<description>SD Hiryuu no Ken (Japan)</description>
 		<year>1994</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-HL" />
@@ -23346,7 +23346,7 @@ more investigation needed...
 	</software>
 
 	<software name="sdgundv">
-		<description>SD Kidou Senshi Gundam - V Sakusen Shidou (Jpn)</description>
+		<description>SD Kidou Senshi Gundam - V Sakusen Shidou (Japan)</description>
 		<year>1992</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-GM" />
@@ -23367,7 +23367,7 @@ more investigation needed...
 	</software>
 
 	<software name="sdgbattl">
-		<description>SD The Great Battle - Aratanaru Chousen (Jpn)</description>
+		<description>SD The Great Battle - Aratanaru Chousen (Japan)</description>
 		<year>1990</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-BS" />
@@ -23408,7 +23408,7 @@ more investigation needed...
 	</software>
 
 	<software name="evermoref" cloneof="evermore">
-		<description>Secret of Evermore (Fra)</description>
+		<description>Secret of Evermore (France)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-AEOF-FRA" />
@@ -23432,7 +23432,7 @@ more investigation needed...
 	</software>
 
 	<software name="evermoreg" cloneof="evermore">
-		<description>Secret of Evermore (Ger)</description>
+		<description>Secret of Evermore (Germany)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-AEOD-NOE" />
@@ -23481,7 +23481,7 @@ more investigation needed...
 	</software>
 
 	<software name="manag" cloneof="mana">
-		<description>Secret of Mana (Ger)</description>
+		<description>Secret of Mana (Germany)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-K2-NOE/SFRG" />
@@ -23560,7 +23560,7 @@ more investigation needed...
 	</software>
 
 	<software name="seikndn2" cloneof="mana">
-		<description>Seiken Densetsu 2 (Jpn)</description>
+		<description>Seiken Densetsu 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-K2" />
@@ -23587,7 +23587,7 @@ more investigation needed...
 	</software>
 
 	<software name="seikndn2a" cloneof="mana">
-		<description>Seiken Densetsu 2 (Jpn, alt)</description>
+		<description>Seiken Densetsu 2 (Japan, alt)</description>
 		<year>1993</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-K2" />
@@ -23616,7 +23616,7 @@ more investigation needed...
 	</software>
 
 	<software name="seikndn3">
-		<description>Seiken Densetsu 3 (Jpn)</description>
+		<description>Seiken Densetsu 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-A3DJ-JPN" />
@@ -23643,7 +23643,7 @@ more investigation needed...
 	</software>
 
 	<software name="seikndn3a" cloneof="seikndn3">
-		<description>Seiken Densetsu 3 (Jpn, alt)</description>
+		<description>Seiken Densetsu 3 (Japan, alt)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-A3DJ-JPN" />
@@ -23696,7 +23696,7 @@ more investigation needed...
 	</software>
 
 	<software name="shangh3">
-		<description>Shanghai III (Jpn)</description>
+		<description>Shanghai III (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-AS3J-JPN" />
@@ -23756,7 +23756,7 @@ more investigation needed...
 	</software>
 
 	<software name="shinmj">
-		<description>Shin Mahjong (Jpn)</description>
+		<description>Shin Mahjong (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-KZ" />
@@ -23784,7 +23784,7 @@ more investigation needed...
 
 	<software name="shinmta" cloneof="shinmt">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Shin Megami Tensei (Jpn)</description>
+		<description>Shin Megami Tensei (Japan)</description>
 		<year>1992</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ME" />
@@ -23812,7 +23812,7 @@ more investigation needed...
 	</software>
 
 	<software name="shinmtifa" cloneof="shinmtif">
-		<description>Shin Megami Tensei if... (Jpn)</description>
+		<description>Shin Megami Tensei if... (Japan)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-AMXJ-JPN" />
@@ -23837,7 +23837,7 @@ more investigation needed...
 	</software>
 
 	<software name="shinmtif">
-		<description>Shin Megami Tensei if... (Jpn, Rev. A)</description>
+		<description>Shin Megami Tensei if... (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-AMXJ-JPN-1" />
@@ -23864,7 +23864,7 @@ more investigation needed...
 	</software>
 
 	<software name="shinmt2b" cloneof="shinmt2">
-		<description>Shin Megami Tensei II (Jpn)</description>
+		<description>Shin Megami Tensei II (Japan)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ZE" />
@@ -23892,7 +23892,7 @@ more investigation needed...
 	</software>
 
 	<software name="shinmt2">
-		<description>Shin Megami Tensei II (Jpn, Rev. B)</description>
+		<description>Shin Megami Tensei II (Japan, Rev. B)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ZE-2" />
@@ -23920,7 +23920,7 @@ more investigation needed...
 
 	<software name="shinmomoa" cloneof="shinmomo">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Shin Momotarou Densetsu (Jpn)</description>
+		<description>Shin Momotarou Densetsu (Japan)</description>
 		<year>1992</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-M5" />
@@ -23947,7 +23947,7 @@ more investigation needed...
 
 	<software name="shinmomoa1" cloneof="shinmomo">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Shin Momotarou Densetsu (Jpn, alt)</description>
+		<description>Shin Momotarou Densetsu (Japan, alt)</description>
 		<year>1992</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-M5" />
@@ -23975,7 +23975,7 @@ more investigation needed...
 	</software>
 
 	<software name="shodanms">
-		<description>Shodan Morita Shougi (Jpn)</description>
+		<description>Shodan Morita Shougi (Japan)</description>
 		<year>1991</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-MS" />
@@ -24001,7 +24001,7 @@ more investigation needed...
 	</software>
 
 	<software name="yuuenchi">
-		<description>Shounen Ashibe - Goma-chan no Yuuenchi Daibouken (Jpn)</description>
+		<description>Shounen Ashibe - Goma-chan no Yuuenchi Daibouken (Japan)</description>
 		<year>1992</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-AS" />
@@ -24022,7 +24022,7 @@ more investigation needed...
 	</software>
 
 	<software name="shounin">
-		<description>Shounin yo, Taishi o Idake!! (Jpn)</description>
+		<description>Shounin yo, Taishi o Idake!! (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AYQJ-JPN" />
@@ -24070,7 +24070,7 @@ more investigation needed...
 	</software>
 
 	<software name="silva2">
-		<description>Silva Saga II - The Legend of Light and Darkness (Jpn)</description>
+		<description>Silva Saga II - The Legend of Light and Darkness (Japan)</description>
 		<year>1993</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-S8" />
@@ -24122,7 +24122,7 @@ more investigation needed...
 	</software>
 
 	<software name="simcityf" cloneof="simcity">
-		<description>SimCity (Fra)</description>
+		<description>SimCity (France)</description>
 		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-SC-FRA/SFRA" />
@@ -24146,7 +24146,7 @@ more investigation needed...
 	</software>
 
 	<software name="simcityg" cloneof="simcity">
-		<description>SimCity (Ger)</description>
+		<description>SimCity (Germany)</description>
 		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-SC-NOE/SFRG" />
@@ -24184,7 +24184,7 @@ more investigation needed...
 	</software>
 
 	<software name="simcityj" cloneof="simcity">
-		<description>SimCity (Jpn)</description>
+		<description>SimCity (Japan)</description>
 		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-SC" />
@@ -24235,7 +24235,7 @@ more investigation needed...
 	</software>
 
 	<software name="simcit2kj" cloneof="simcit2k">
-		<description>SimCity 2000 (Jpn)</description>
+		<description>SimCity 2000 (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AWWJ-JPN" />
@@ -24261,7 +24261,7 @@ more investigation needed...
 	</software>
 
 	<software name="simcitjr">
-		<description>SimCity Jr. (Jpn)</description>
+		<description>SimCity Jr. (Japan)</description>
 		<year>1996</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-ALIJ-JPN" />
@@ -24287,7 +24287,7 @@ more investigation needed...
 	</software>
 
 	<software name="simearthja" cloneof="simearth">
-		<description>SimEarth - The Living Planet (Jpn)</description>
+		<description>SimEarth - The Living Planet (Japan)</description>
 		<year>1991</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-SE" />
@@ -24313,7 +24313,7 @@ more investigation needed...
 	</software>
 
 	<software name="simearthj" cloneof="simearth">
-		<description>SimEarth - The Living Planet (Jpn, Rev. A)</description>
+		<description>SimEarth - The Living Planet (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-SE" />
@@ -24359,7 +24359,7 @@ more investigation needed...
 	</software>
 
 	<software name="skymiss" cloneof="blazsky">
-		<description>Sky Mission (Jpn)</description>
+		<description>Sky Mission (Japan)</description>
 		<year>1992</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-SI" />
@@ -24420,7 +24420,7 @@ more investigation needed...
 	</software>
 
 	<software name="slayers">
-		<description>Slayers (Jpn)</description>
+		<description>Slayers (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-UZ" />
@@ -24468,7 +24468,7 @@ more investigation needed...
 	</software>
 
 	<software name="smashtvj" cloneof="ssmashtv">
-		<description>Smash T.V. (Jpn)</description>
+		<description>Smash T.V. (Japan)</description>
 		<year>1992</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-TV" />
@@ -24531,7 +24531,7 @@ more investigation needed...
 	</software>
 
 	<software name="soulbldr" cloneof="soulblzr">
-		<description>Soul Blader (Jpn)</description>
+		<description>Soul Blader (Japan)</description>
 		<year>1992</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-SO" />
@@ -24557,7 +24557,7 @@ more investigation needed...
 	</software>
 
 	<software name="soulblzrg" cloneof="soulblzr">
-		<description>Soul Blazer (Ger)</description>
+		<description>Soul Blazer (Germany)</description>
 		<year>1994</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SNSP-SO-NOE/SFRG" />
@@ -24608,7 +24608,7 @@ more investigation needed...
 	</software>
 
 	<software name="soundtsu" supported="partial">
-		<description>Sound Novel Tsukuru (Jpn)</description>
+		<description>Sound Novel Tsukuru (Japan)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-ZSNJ-JPN" />
@@ -24654,7 +24654,7 @@ more investigation needed...
 	</software>
 
 	<software name="spacebaz" cloneof="batlclsh">
-		<description>Space Bazooka (Jpn)</description>
+		<description>Space Bazooka (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BT" />
@@ -24676,7 +24676,7 @@ more investigation needed...
 	</software>
 
 	<software name="spaceinvj" cloneof="spaceinv">
-		<description>Space Invaders - The Original Game (Jpn)</description>
+		<description>Space Invaders - The Original Game (Japan)</description>
 		<year>1994</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-IC" />
@@ -24797,7 +24797,7 @@ more investigation needed...
 	</software>
 
 	<software name="standrew">
-		<description>St. Andrews - Eikou to Rekishi no Old Course (Jpn)</description>
+		<description>St. Andrews - Eikou to Rekishi no Old Course (Japan)</description>
 		<year>1995</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-ASAJ-JPN" />
@@ -24823,7 +24823,7 @@ more investigation needed...
 	</software>
 
 	<software name="stablest">
-		<description>Stable Star - Kyuusha Monogatari (Jpn)</description>
+		<description>Stable Star - Kyuusha Monogatari (Japan)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AKQJ-JPN" />
@@ -24850,7 +24850,7 @@ more investigation needed...
 	</software>
 
 	<software name="starfoxja" cloneof="starwing">
-		<description>Star Fox (Jpn)</description>
+		<description>Star Fox (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-FO" />
@@ -24955,7 +24955,7 @@ more investigation needed...
 	</software>
 
 	<software name="starocn">
-		<description>Star Ocean (Jpn)</description>
+		<description>Star Ocean (Japan)</description>
 		<year>1996</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-ARFJ-JPN" />
@@ -25053,7 +25053,7 @@ more investigation needed...
 	</software>
 
 	<software name="starwingg" cloneof="starwing">
-		<description>Starwing (Ger)</description>
+		<description>Starwing (Germany)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-FO-NOE/SFRG" />
@@ -25201,7 +25201,7 @@ more investigation needed...
 	</software>
 
 	<software name="sf2j" cloneof="sf2">
-		<description>Street Fighter II - The World Warrior (Jpn)</description>
+		<description>Street Fighter II - The World Warrior (Japan)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-S2" />
@@ -25222,7 +25222,7 @@ more investigation needed...
 	</software>
 
 	<software name="sf2ja" cloneof="sf2">
-		<description>Street Fighter II - The World Warrior (Jpn, alt)</description>
+		<description>Street Fighter II - The World Warrior (Japan, alt)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-S2" />
@@ -25295,7 +25295,7 @@ more investigation needed...
 
 	<software name="sf2tj" cloneof="sf2t">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Street Fighter II Turbo - Hyper Fighting (Jpn)</description>
+		<description>Street Fighter II Turbo - Hyper Fighting (Japan)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-TI" />
@@ -25331,7 +25331,7 @@ more investigation needed...
 
 	<software name="sf2tja" cloneof="sf2t">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Street Fighter II Turbo - Hyper Fighting (Jpn, alt)</description>
+		<description>Street Fighter II Turbo - Hyper Fighting (Japan, alt)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-TI" />
@@ -25406,7 +25406,7 @@ more investigation needed...
 	</software>
 
 	<software name="sfz2" cloneof="sfa2">
-		<description>Street Fighter Zero 2 (Jpn)</description>
+		<description>Street Fighter Zero 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AUZJ-JPN" />
@@ -25519,7 +25519,7 @@ more investigation needed...
 	</software>
 <!-- wip-sup -->
 	<software name="super3db" cloneof="basload2">
-		<description>Super 3D Baseball (Jpn)</description>
+		<description>Super 3D Baseball (Japan)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-3D" />
@@ -25580,7 +25580,7 @@ more investigation needed...
 	</software>
 
 	<software name="airdiverj" cloneof="airdiver">
-		<description>Super Air Diver (Jpn)</description>
+		<description>Super Air Diver (Japan)</description>
 		<year>1993</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-AZ" />
@@ -25608,7 +25608,7 @@ more investigation needed...
 	</software>
 
 	<software name="airdivr2">
-		<description>Super Air Diver 2 (Jpn)</description>
+		<description>Super Air Diver 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-AADJ-JPN" />
@@ -25638,7 +25638,7 @@ more investigation needed...
 	</software>
 
 	<software name="genchohi" cloneof="genghis2">
-		<description>Super Aoki Ookami to Shiroki Mejika - Genchou Hishi (Jpn)</description>
+		<description>Super Aoki Ookami to Shiroki Mejika - Genchou Hishi (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-G2" />
@@ -25732,7 +25732,7 @@ more investigation needed...
 	</software>
 
 	<software name="sbombmanj" cloneof="sbombman">
-		<description>Super Bomberman (Jpn)</description>
+		<description>Super Bomberman (Japan)</description>
 		<year>1993</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-H6" />
@@ -25801,7 +25801,7 @@ more investigation needed...
 	</software>
 
 	<software name="sbombmn2j" cloneof="sbombmn2">
-		<description>Super Bomberman 2 (Jpn)</description>
+		<description>Super Bomberman 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-M4" />
@@ -25842,7 +25842,7 @@ more investigation needed...
 	</software>
 
 	<software name="sbombmn3j" cloneof="sbombmn3">
-		<description>Super Bomberman 3 (Jpn)</description>
+		<description>Super Bomberman 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AS6J-JPN" />
@@ -25866,7 +25866,7 @@ more investigation needed...
 	</software>
 
 	<software name="panicbw">
-		<description>Super Bomberman - Panic Bomber W (Jpn)</description>
+		<description>Super Bomberman - Panic Bomber W (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-APBJ-JPN" />
@@ -25888,7 +25888,7 @@ more investigation needed...
 	</software>
 
 	<software name="sbomblis">
-		<description>Super Bombliss (Jpn)</description>
+		<description>Super Bombliss (Japan)</description>
 		<year>1995</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-ABOJ-JPN" />
@@ -25914,7 +25914,7 @@ more investigation needed...
 	</software>
 
 	<software name="sbowlingj" cloneof="sbowling">
-		<description>Super Bowling (Jpn)</description>
+		<description>Super Bowling (Japan)</description>
 		<year>1992</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-BW" />
@@ -25994,7 +25994,7 @@ more investigation needed...
 	</software>
 
 	<software name="schinwld" cloneof="ninjaboy">
-		<description>Super Chinese World (Jpn)</description>
+		<description>Super Chinese World (Japan)</description>
 		<year>1991</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-CW" />
@@ -26015,7 +26015,7 @@ more investigation needed...
 	</software>
 
 	<software name="schinwl2">
-		<description>Super Chinese World 2 - Uchuu Ichibutou Taikai (Jpn)</description>
+		<description>Super Chinese World 2 - Uchuu Ichibutou Taikai (Japan)</description>
 		<year>1993</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-CU" />
@@ -26036,7 +26036,7 @@ more investigation needed...
 	</software>
 
 	<software name="supercup" cloneof="sgoal">
-		<description>Super Cup Soccer (Jpn)</description>
+		<description>Super Cup Soccer (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-SU" />
@@ -26062,7 +26062,7 @@ more investigation needed...
 	</software>
 
 	<software name="daikokaia" cloneof="unchartd">
-		<description>Super Daikoukai Jidai (Jpn)</description>
+		<description>Super Daikoukai Jidai (Japan)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-QK" />
@@ -26088,7 +26088,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongcja" cloneof="dkongc">
-		<description>Super Donkey Kong (Jpn)</description>
+		<description>Super Donkey Kong (Japan)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-8X / G728314" />
@@ -26115,7 +26115,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongcj" cloneof="dkongc">
-		<description>Super Donkey Kong (Jpn, Rev. A)</description>
+		<description>Super Donkey Kong (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-8X / G728314" />
@@ -26143,7 +26143,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongc2ja" cloneof="dkongc2">
-		<description>Super Donkey Kong 2 - Dixie &amp; Diddy (Jpn)</description>
+		<description>Super Donkey Kong 2 - Dixie &amp; Diddy (Japan)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ADNJ-JPN / G740814" />
@@ -26170,7 +26170,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongc2ja1" cloneof="dkongc2">
-		<description>Super Donkey Kong 2 - Dixie &amp; Diddy (Jpn, alt)</description>
+		<description>Super Donkey Kong 2 - Dixie &amp; Diddy (Japan, alt)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ADNJ-JPN / G740814" />
@@ -26199,7 +26199,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongc2j" cloneof="dkongc2">
-		<description>Super Donkey Kong 2 - Dixie &amp; Diddy (Jpn, Rev. A)</description>
+		<description>Super Donkey Kong 2 - Dixie &amp; Diddy (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ADNJ-JPN / G740814, SHVC-ADNJ-JPN-1 / G743669" />
@@ -26227,7 +26227,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongc2j1" cloneof="dkongc2">
-		<description>Super Donkey Kong 2 - Dixie &amp; Diddy (Jpn, Rev. A, alt)</description>
+		<description>Super Donkey Kong 2 - Dixie &amp; Diddy (Japan, Rev. A, alt)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ADNJ-JPN-1 / G743669" />
@@ -26257,7 +26257,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongc3ja" cloneof="dkongc3">
-		<description>Super Donkey Kong 3 - Nazo no Krems-tou (Jpn)</description>
+		<description>Super Donkey Kong 3 - Nazo no Krems-tou (Japan)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-A3CJ-JPN" />
@@ -26284,7 +26284,7 @@ more investigation needed...
 	</software>
 
 	<software name="dkongc3j" cloneof="dkongc3">
-		<description>Super Donkey Kong 3 - Nazo no Krems-tou (Jpn, Rev. A)</description>
+		<description>Super Donkey Kong 3 - Nazo no Krems-tou (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-A3CJ-JPN" />
@@ -26360,7 +26360,7 @@ more investigation needed...
 	</software>
 
 	<software name="supf1c">
-		<description>Super F1 Circus (Jpn)</description>
+		<description>Super F1 Circus (Japan)</description>
 		<year>1992</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-FC" />
@@ -26386,7 +26386,7 @@ more investigation needed...
 	</software>
 
 	<software name="supf1c2">
-		<description>Super F1 Circus 2 (Jpn)</description>
+		<description>Super F1 Circus 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-N2" />
@@ -26414,7 +26414,7 @@ more investigation needed...
 	</software>
 
 	<software name="supf1c3">
-		<description>Super F1 Circus 3 (Jpn)</description>
+		<description>Super F1 Circus 3 (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-N3" />
@@ -26440,7 +26440,7 @@ more investigation needed...
 	</software>
 
 	<software name="famicirc">
-		<description>Super Family Circuit (Jpn)</description>
+		<description>Super Family Circuit (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-23" />
@@ -26467,7 +26467,7 @@ more investigation needed...
 	</software>
 
 	<software name="sfamista" cloneof="batterup">
-		<description>Super Famista (Jpn)</description>
+		<description>Super Famista (Japan)</description>
 		<year>1992</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-FA" />
@@ -26488,7 +26488,7 @@ more investigation needed...
 	</software>
 
 	<software name="sfamist2">
-		<description>Super Famista 2 (Jpn)</description>
+		<description>Super Famista 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-FI" />
@@ -26509,7 +26509,7 @@ more investigation needed...
 	</software>
 
 	<software name="sfamist3">
-		<description>Super Famista 3 (Jpn)</description>
+		<description>Super Famista 3 (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-N6" />
@@ -26536,7 +26536,7 @@ more investigation needed...
 	</software>
 
 	<software name="sfamist4a" cloneof="sfamist4">
-		<description>Super Famista 4 (Jpn)</description>
+		<description>Super Famista 4 (Japan)</description>
 		<year>1995</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-AF4J-JPN" />
@@ -26563,7 +26563,7 @@ more investigation needed...
 	</software>
 
 	<software name="sfamist4">
-		<description>Super Famista 4 (Jpn, Rev. A)</description>
+		<description>Super Famista 4 (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-AF4J-JPN" />
@@ -26591,7 +26591,7 @@ more investigation needed...
 	</software>
 
 	<software name="sfamist5">
-		<description>Super Famista 5 (Jpn)</description>
+		<description>Super Famista 5 (Japan)</description>
 		<year>1996</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-A27J-JPN" />
@@ -26619,7 +26619,7 @@ more investigation needed...
 	</software>
 
 	<software name="fireprwq">
-		<description>Super Fire Pro Wrestling - Queen's Special (Jpn)</description>
+		<description>Super Fire Pro Wrestling - Queen's Special (Japan)</description>
 		<year>1995</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AQQJ-JPN" />
@@ -26646,7 +26646,7 @@ more investigation needed...
 	</software>
 
 	<software name="fireprow">
-		<description>Super Fire Pro Wrestling (Jpn)</description>
+		<description>Super Fire Pro Wrestling (Japan)</description>
 		<year>1991</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-FP" />
@@ -26667,7 +26667,7 @@ more investigation needed...
 	</software>
 
 	<software name="fireprw2">
-		<description>Super Fire Pro Wrestling 2 (Jpn)</description>
+		<description>Super Fire Pro Wrestling 2 (Japan)</description>
 		<year>1992</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-FF" />
@@ -26688,7 +26688,7 @@ more investigation needed...
 	</software>
 
 	<software name="fireprw3a" cloneof="fireprw3">
-		<description>Super Fire Pro Wrestling III - Final Bout (Jpn)</description>
+		<description>Super Fire Pro Wrestling III - Final Bout (Japan)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-F3" />
@@ -26717,7 +26717,7 @@ more investigation needed...
 	</software>
 
 	<software name="fireprwsa" cloneof="fireprws">
-		<description>Super Fire Pro Wrestling Special (Jpn)</description>
+		<description>Super Fire Pro Wrestling Special (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AP4J-JPN" />
@@ -26745,7 +26745,7 @@ more investigation needed...
 	</software>
 
 	<software name="fireprx">
-		<description>Super Fire Pro Wrestling X (Jpn)</description>
+		<description>Super Fire Pro Wrestling X (Japan)</description>
 		<year>1995</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AF5J-JPN" />
@@ -26772,7 +26772,7 @@ more investigation needed...
 	</software>
 
 	<software name="formsocr" cloneof="ssoccer">
-		<description>Super Formation Soccer (Jpn)</description>
+		<description>Super Formation Soccer (Japan)</description>
 		<year>1991</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-FS" />
@@ -26793,7 +26793,7 @@ more investigation needed...
 	</software>
 
 	<software name="formsoc2">
-		<description>Super Formation Soccer II (Jpn)</description>
+		<description>Super Formation Soccer II (Japan)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-2S" />
@@ -26819,7 +26819,7 @@ more investigation needed...
 	</software>
 
 	<software name="forms94">
-		<description>Super Formation Soccer 94 - World Cup Edition (Jpn)</description>
+		<description>Super Formation Soccer 94 - World Cup Edition (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-3F" />
@@ -26846,7 +26846,7 @@ more investigation needed...
 	</software>
 
 	<software name="forms94f">
-		<description>Super Formation Soccer 94 - World Cup Final Data (Jpn)</description>
+		<description>Super Formation Soccer 94 - World Cup Final Data (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-A3FJ-JPN" />
@@ -26873,7 +26873,7 @@ more investigation needed...
 	</software>
 
 	<software name="forms95">
-		<description>Super Formation Soccer 95 della Serie A (Jpn)</description>
+		<description>Super Formation Soccer 95 della Serie A (Japan)</description>
 		<year>1995</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-A95J-JPN" />
@@ -26902,7 +26902,7 @@ more investigation needed...
 	</software>
 
 	<software name="sgboyj" cloneof="sgboy">
-		<description>Super Game Boy (Jpn)</description>
+		<description>Super Game Boy (Japan)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-SGB" />
@@ -26929,7 +26929,7 @@ more investigation needed...
 	</software>
 
 	<software name="sgboyj1" cloneof="sgboy">
-		<description>Super Game Boy (Jpn, alt)</description> <!-- Alternate hardware -->
+		<description>Super Game Boy (Japan, alt)</description> <!-- Alternate hardware -->
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-SGB" />
@@ -26984,7 +26984,7 @@ more investigation needed...
 	</software>
 
 	<software name="sgboy2">
-		<description>Super Game Boy 2 (Jpn)</description>
+		<description>Super Game Boy 2 (Japan)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-SGB2-JPN" />
@@ -27013,7 +27013,7 @@ more investigation needed...
 	</software>
 
 	<software name="sgenjin" cloneof="superbc">
-		<description>Super Genjin (Jpn)</description>
+		<description>Super Genjin (Japan)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-ZH" />
@@ -27078,7 +27078,7 @@ more investigation needed...
 	</software>
 
 	<software name="shimpactj" cloneof="shimpact">
-		<description>Super High Impact (Jpn)</description>
+		<description>Super High Impact (Japan)</description>
 		<year>1993</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-HX" />
@@ -27099,7 +27099,7 @@ more investigation needed...
 	</software>
 
 	<software name="giseiha">
-		<description>Super Honmei - GI Seiha (Jpn)</description>
+		<description>Super Honmei - GI Seiha (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-IK" />
@@ -27127,7 +27127,7 @@ more investigation needed...
 	</software>
 
 	<software name="superigo">
-		<description>Super Igo - Go Ou (Jpn)</description>
+		<description>Super Igo - Go Ou (Japan)</description>
 		<year>1994</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-IG" />
@@ -27149,7 +27149,7 @@ more investigation needed...
 	</software>
 
 	<software name="suprinin" cloneof="inindo">
-		<description>Super Inindou - Datou Nobunaga (Jpn)</description>
+		<description>Super Inindou - Datou Nobunaga (Japan)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IN" />
@@ -27216,7 +27216,7 @@ more investigation needed...
 	</software>
 
 	<software name="sjinseia" cloneof="sjinsei">
-		<description>Super Jinsei Game (Jpn)</description>
+		<description>Super Jinsei Game (Japan)</description>
 		<year>1994</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-LG" />
@@ -27244,7 +27244,7 @@ more investigation needed...
 	</software>
 
 	<software name="sjinsei">
-		<description>Super Jinsei Game (Jpn, Rev. A)</description>
+		<description>Super Jinsei Game (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-LG" />
@@ -27273,7 +27273,7 @@ more investigation needed...
 	</software>
 
 	<software name="sjinsei2a" cloneof="sjinsei2">
-		<description>Super Jinsei Game 2 (Jpn)</description>
+		<description>Super Jinsei Game 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-AL2J-JPN" />
@@ -27301,7 +27301,7 @@ more investigation needed...
 	</software>
 
 	<software name="sjinsei3a" cloneof="sjinsei3">
-		<description>Super Jinsei Game 3 (Jpn)</description>
+		<description>Super Jinsei Game 3 (Japan)</description>
 		<year>1996</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-A3XJ-JPN" />
@@ -27327,7 +27327,7 @@ more investigation needed...
 	</software>
 
 	<software name="skeiba">
-		<description>Super Keiba (Jpn)</description>
+		<description>Super Keiba (Japan)</description>
 		<year>1993</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-KB" />
@@ -27354,7 +27354,7 @@ more investigation needed...
 	</software>
 
 	<software name="skeiba2">
-		<description>Super Keiba 2 (Jpn)</description>
+		<description>Super Keiba 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-AKBJ-JPN" />
@@ -27382,7 +27382,7 @@ more investigation needed...
 	</software>
 
 	<software name="superky2">
-		<description>Super Kyoutei 2 (Jpn)</description>
+		<description>Super Kyoutei 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-A2YJ-JPN" />
@@ -27409,7 +27409,7 @@ more investigation needed...
 	</software>
 
 	<software name="haristad">
-		<description>Super Kyuukyoku Harikiri Stadium (Jpn)</description>
+		<description>Super Kyuukyoku Harikiri Stadium (Japan)</description>
 		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-HI" />
@@ -27437,7 +27437,7 @@ more investigation needed...
 	</software>
 
 	<software name="haristd2">
-		<description>Super Kyuukyoku Harikiri Stadium 2 (Jpn)</description>
+		<description>Super Kyuukyoku Harikiri Stadium 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-9H" />
@@ -27465,7 +27465,7 @@ more investigation needed...
 	</software>
 
 	<software name="sloopzj" cloneof="sloopz">
-		<description>Super Loopz (Jpn)</description>
+		<description>Super Loopz (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-2E" />
@@ -27486,7 +27486,7 @@ more investigation needed...
 	</software>
 
 	<software name="supermj">
-		<description>Super Mahjong (Jpn)</description>
+		<description>Super Mahjong (Japan)</description>
 		<year>1992</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-SM" />
@@ -27507,7 +27507,7 @@ more investigation needed...
 	</software>
 
 	<software name="supermj2a" cloneof="supermj2">
-		<description>Super Mahjong 2 - Honkaku 4-nin Uchi! (Jpn)</description>
+		<description>Super Mahjong 2 - Honkaku 4-nin Uchi! (Japan)</description>
 		<year>1993</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-2A" />
@@ -27533,7 +27533,7 @@ more investigation needed...
 	</software>
 
 	<software name="supermjte" cloneof="supermjt">
-		<description>Super Mahjong Taikai (Jpn)</description>
+		<description>Super Mahjong Taikai (Japan)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IQ" />
@@ -27559,7 +27559,7 @@ more investigation needed...
 	</software>
 
 	<software name="supermjtd" cloneof="supermjt">
-		<description>Super Mahjong Taikai (Jpn, Rev. A)</description>
+		<description>Super Mahjong Taikai (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IQ" />
@@ -27746,7 +27746,7 @@ more investigation needed...
 
 	<software name="smcolla" cloneof="smas">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Mario Collection (Jpn)</description>
+		<description>Super Mario Collection (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-4M" />
@@ -27834,7 +27834,7 @@ more investigation needed...
 	</software>
 
 	<software name="smkartja" cloneof="smkart">
-		<description>Super Mario Kart (Jpn)</description>
+		<description>Super Mario Kart (Japan)</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-MK" />
@@ -27867,7 +27867,7 @@ more investigation needed...
 
 	<software name="smkartj" cloneof="smkart">
 		<!-- Revision A, with DSP firmware update -->
-		<description>Super Mario Kart (Jpn, Rev. A)</description>
+		<description>Super Mario Kart (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-MK" />
@@ -27930,7 +27930,7 @@ more investigation needed...
 	</software>
 
 	<software name="smrpgj" cloneof="smrpg" supported="partial">
-		<description>Super Mario RPG (Jpn)</description>
+		<description>Super Mario RPG (Japan)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ARWJ-JPN" />
@@ -28031,7 +28031,7 @@ more investigation needed...
 
 	<software name="smwj" cloneof="smw">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Mario World - Super Mario Bros. 4 (Jpn)</description>
+		<description>Super Mario World - Super Mario Bros. 4 (Japan)</description>
 		<year>1990</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-MW" />
@@ -28166,7 +28166,7 @@ more investigation needed...
 	</software>
 
 	<software name="smw2jb" cloneof="smw2">
-		<description>Super Mario - Yossy Island (Jpn)</description>
+		<description>Super Mario - Yossy Island (Japan)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-YI / G737679" />
@@ -28222,7 +28222,7 @@ more investigation needed...
 	</software>
 
 	<software name="smetroidj" cloneof="smetroid">
-		<description>Super Metroid (Jpn, alt PCB)</description>
+		<description>Super Metroid (Japan, alt PCB)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-RI" />
@@ -28253,7 +28253,7 @@ more investigation needed...
 	</software>
 
 	<software name="smetroidu" cloneof="smetroid">
-		<description>Super Metroid (Jpn, USA)</description>
+		<description>Super Metroid (Japan, USA)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNS-RI-USA, SHVC-RI" />
@@ -28283,7 +28283,7 @@ more investigation needed...
 
 	<software name="smomo2">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Momotarou Dentetsu II (Jpn)</description>
+		<description>Super Momotarou Dentetsu II (Japan)</description>
 		<year>1992</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-H4" />
@@ -28317,7 +28317,7 @@ more investigation needed...
 	</software>
 
 	<software name="smomo3b" cloneof="smomo3">
-		<description>Super Momotarou Dentetsu III (Jpn)</description>
+		<description>Super Momotarou Dentetsu III (Japan)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AMDJ-JPN" />
@@ -28343,7 +28343,7 @@ more investigation needed...
 	</software>
 
 	<software name="smomo3a" cloneof="smomo3">
-		<description>Super Momotarou Dentetsu III (Jpn, Rev. A)</description>
+		<description>Super Momotarou Dentetsu III (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AMDJ-JPN" />
@@ -28370,7 +28370,7 @@ more investigation needed...
 	</software>
 
 	<software name="smomo3">
-		<description>Super Momotarou Dentetsu III (Jpn, Rev. B)</description>
+		<description>Super Momotarou Dentetsu III (Japan, Rev. B)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AMDJ-JPN" />
@@ -28397,7 +28397,7 @@ more investigation needed...
 	</software>
 
 	<software name="smomodx">
-		<description>Super Momotarou Dentetsu DX (Jpn)</description>
+		<description>Super Momotarou Dentetsu DX (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AH6J-JPN" />
@@ -28423,7 +28423,7 @@ more investigation needed...
 	</software>
 
 	<software name="supnaxat">
-		<description>Super Naxat Open - Golf de Shoubu Da! Dorabocchan (Jpn)</description>
+		<description>Super Naxat Open - Golf de Shoubu Da! Dorabocchan (Japan)</description>
 		<year>1994</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-XD" />
@@ -28450,7 +28450,7 @@ more investigation needed...
 	</software>
 
 	<software name="snazopuy">
-		<description>Super Nazo Puyo - Rulue no Roux (Jpn)</description>
+		<description>Super Nazo Puyo - Rulue no Roux (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ANQJ-JPN" />
@@ -28476,7 +28476,7 @@ more investigation needed...
 	</software>
 
 	<software name="nichimj">
-		<description>Super Nichibutsu Mahjong (Jpn)</description>
+		<description>Super Nichibutsu Mahjong (Japan)</description>
 		<year>1992</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-NM" />
@@ -28502,7 +28502,7 @@ more investigation needed...
 	</software>
 
 	<software name="nichimj2">
-		<description>Super Nichibutsu Mahjong 2 - Zenkoku Seiha Hen (Jpn)</description>
+		<description>Super Nichibutsu Mahjong 2 - Zenkoku Seiha Hen (Japan)</description>
 		<year>1993</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-2N" />
@@ -28523,7 +28523,7 @@ more investigation needed...
 	</software>
 
 	<software name="nobubufu1" cloneof="nobuldrk">
-		<description>Super Nobunaga no Yabou - Bushou Fuuunroku (Jpn)</description>
+		<description>Super Nobunaga no Yabou - Bushou Fuuunroku (Japan)</description>
 		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IZ" />
@@ -28549,7 +28549,7 @@ more investigation needed...
 	</software>
 
 	<software name="nobuzenk" cloneof="nobuamb">
-		<description>Super Nobunaga no Yabou - Zenkoku Ban (Jpn)</description>
+		<description>Super Nobunaga no Yabou - Zenkoku Ban (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-NZ" />
@@ -28595,7 +28595,7 @@ more investigation needed...
 	</software>
 
 	<software name="superoku">
-		<description>Super Okumanchouja Game (Jpn)</description>
+		<description>Super Okumanchouja Game (Japan)</description>
 		<year>1995</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-ABGJ-JPN" />
@@ -28622,7 +28622,7 @@ more investigation needed...
 
 	<software name="superozu">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Oozumou - Nessen Ooichiban (Jpn)</description>
+		<description>Super Oozumou - Nessen Ooichiban (Japan)</description>
 		<year>1992</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-OK" />
@@ -28643,7 +28643,7 @@ more investigation needed...
 	</software>
 
 	<software name="suppslot">
-		<description>Super Pachi-Slot Mahjong (Jpn)</description>
+		<description>Super Pachi-Slot Mahjong (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-QU" />
@@ -28669,7 +28669,7 @@ more investigation needed...
 	</software>
 
 	<software name="suppachi">
-		<description>Super Pachinko Taisen (Jpn)</description>
+		<description>Super Pachinko Taisen (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ADXJ-JPN" />
@@ -28690,7 +28690,7 @@ more investigation needed...
 	</software>
 
 	<software name="spinbalj" cloneof="spinbal">
-		<description>Super Pinball - Behind the Mask (Jpn)</description>
+		<description>Super Pinball - Behind the Mask (Japan)</description>
 		<year>1994</year>
 		<publisher>Meldac</publisher>
 		<info name="serial" value="SHVC-3P" />
@@ -28733,7 +28733,7 @@ more investigation needed...
 	</software>
 
 	<software name="spleague">
-		<description>Super Power League (Jpn)</description>
+		<description>Super Power League (Japan)</description>
 		<year>1993</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-M3" />
@@ -28761,7 +28761,7 @@ more investigation needed...
 	</software>
 
 	<software name="spleagu2a" cloneof="spleagu2">
-		<description>Super Power League 2 (Jpn)</description>
+		<description>Super Power League 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-Z4" />
@@ -28787,7 +28787,7 @@ more investigation needed...
 	</software>
 
 	<software name="spleagu3">
-		<description>Super Power League 3 (Jpn)</description>
+		<description>Super Power League 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AP9J-JPN" />
@@ -28815,7 +28815,7 @@ more investigation needed...
 	</software>
 
 	<software name="spleagu4">
-		<description>Super Power League 4 (Jpn)</description>
+		<description>Super Power League 4 (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AE7J-JPN" />
@@ -28864,7 +28864,7 @@ more investigation needed...
 	</software>
 
 	<software name="spbaseb" cloneof="basload">
-		<description>Super Professional Baseball (Jpn)</description>
+		<description>Super Professional Baseball (Japan)</description>
 		<year>1991</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-SP" />
@@ -28909,7 +28909,7 @@ more investigation needed...
 	</software>
 
 	<software name="spuyopb" cloneof="spuyop">
-		<description>Super Puyo Puyo (Jpn)</description>
+		<description>Super Puyo Puyo (Japan)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-PQ" />
@@ -28933,7 +28933,7 @@ more investigation needed...
 	</software>
 
 	<software name="spuyopa" cloneof="spuyop">
-		<description>Super Puyo Puyo (Jpn, Rev. A)</description>
+		<description>Super Puyo Puyo (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-PQ" />
@@ -28955,7 +28955,7 @@ more investigation needed...
 	</software>
 
 	<software name="spuyop">
-		<description>Super Puyo Puyo (Jpn, Rev. B)</description>
+		<description>Super Puyo Puyo (Japan, Rev. B)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-PQ" />
@@ -29016,7 +29016,7 @@ more investigation needed...
 	</software>
 
 	<software name="srmp4">
-		<description>Super Real Mahjong PIV (Jpn)</description>
+		<description>Super Real Mahjong PIV (Japan)</description>
 		<year>1997</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-4S" />
@@ -29037,7 +29037,7 @@ more investigation needed...
 	</software>
 
 	<software name="srobotex">
-		<description>Super Robot Taisen EX (Jpn)</description>
+		<description>Super Robot Taisen EX (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-E6" />
@@ -29065,7 +29065,7 @@ more investigation needed...
 	</software>
 
 	<software name="srugby">
-		<description>Super Rugby (Jpn)</description>
+		<description>Super Rugby (Japan)</description>
 		<year>1994</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-I3" />
@@ -29092,7 +29092,7 @@ more investigation needed...
 	</software>
 
 	<software name="sangoku">
-		<description>Super Sangokushi (Jpn)</description>
+		<description>Super Sangokushi (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-I4" />
@@ -29118,7 +29118,7 @@ more investigation needed...
 	</software>
 
 	<software name="sangoku2a" cloneof="roman3k2">
-		<description>Super Sangokushi II (Jpn)</description>
+		<description>Super Sangokushi II (Japan)</description>
 		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-XL" />
@@ -29144,7 +29144,7 @@ more investigation needed...
 	</software>
 
 	<software name="sangoku2" cloneof="roman3k2">
-		<description>Super Sangokushi II (Jpn, Rev. A)</description>
+		<description>Super Sangokushi II (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-XL / SHVC-XL-1" />
@@ -29180,7 +29180,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="sscope6j" cloneof="nscope6">
-		<description>Super Scope 6 (Jpn)</description>
+		<description>Super Scope 6 (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-LR" />
@@ -29201,7 +29201,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="sshogi2">
-		<description>Super Shougi 2 (Jpn)</description>
+		<description>Super Shougi 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-2B" />
@@ -29288,7 +29288,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="suprstad" cloneof="nolanbb">
-		<description>Super Stadium (Jpn)</description>
+		<description>Super Stadium (Japan)</description>
 		<year>1991</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-SS" />
@@ -29497,7 +29497,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ssf2j" cloneof="ssf2">
-		<description>Super Street Fighter II - The New Challengers (Jpn)</description>
+		<description>Super Street Fighter II - The New Challengers (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-XW" />
@@ -29564,7 +29564,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="stennisj" cloneof="stennis">
-		<description>Super Tennis - World Circuit (Jpn)</description>
+		<description>Super Tennis - World Circuit (Japan)</description>
 		<year>1991</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-ST" />
@@ -29625,7 +29625,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="stetris2g" cloneof="stetris2">
-		<description>Super Tetris 2 + Bombliss Genteiban (Jpn)</description>
+		<description>Super Tetris 2 + Bombliss Genteiban (Japan)</description>
 		<year>1994</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-5T" />
@@ -29651,7 +29651,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="stetris2a" cloneof="stetris2">
-		<description>Super Tetris 2 + Bombliss (Jpn)</description>
+		<description>Super Tetris 2 + Bombliss (Japan)</description>
 		<year>1992</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-T2" />
@@ -29677,7 +29677,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="stetris3">
-		<description>Super Tetris 3 (Jpn)</description>
+		<description>Super Tetris 3 (Japan)</description>
 		<year>1994</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-AT3J-JPN" />
@@ -29762,7 +29762,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="subaseb" cloneof="bbsim1k">
-		<description>Super Ultra Baseball (Jpn)</description>
+		<description>Super Ultra Baseball (Japan)</description>
 		<year>1991</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-UB" />
@@ -29788,7 +29788,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="superuno">
-		<description>Super Uno (Jpn, Rev. A)</description>
+		<description>Super Uno (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-UN" />
@@ -29811,7 +29811,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="svalis" cloneof="svalis4">
-		<description>Super Valis - Akaki Tsuki no Otome (Jpn)</description>
+		<description>Super Valis - Akaki Tsuki no Otome (Japan)</description>
 		<year>1992</year>
 		<publisher>Laser Soft</publisher>
 		<info name="serial" value="SHVC-VA" />
@@ -29833,7 +29833,7 @@ Alternate board (XL-1)
 
 	<software name="swagan">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Wagyan Land (Jpn)</description>
+		<description>Super Wagyan Land (Japan)</description>
 		<year>1991</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-SW" />
@@ -29855,7 +29855,7 @@ Alternate board (XL-1)
 
 	<software name="swagan2">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Wagyan Land 2 (Jpn)</description>
+		<description>Super Wagyan Land 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-S6" />
@@ -29896,7 +29896,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="superpac">
-		<description>Super!! Pachinko (Jpn)</description>
+		<description>Super!! Pachinko (Japan)</description>
 		<year>1994</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-Q7" />
@@ -29924,7 +29924,7 @@ Alternate board (XL-1)
 
 	<software name="swordwld">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Sword World SFC (Jpn)</description>
+		<description>Sword World SFC (Japan)</description>
 		<year>1993</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-AW" />
@@ -29952,7 +29952,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="swordwl2a" cloneof="swordwl2">
-		<description>Sword World SFC 2 - Inishie no Kyojin Densetsu (Jpn)</description>
+		<description>Sword World SFC 2 - Inishie no Kyojin Densetsu (Japan)</description>
 		<year>1994</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-7M" />
@@ -30018,7 +30018,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tactsocr">
-		<description>Tactical Soccer (Jpn)</description>
+		<description>Tactical Soccer (Japan)</description>
 		<year>1995</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-AZZJ-JPN" />
@@ -30042,7 +30042,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="taikoris">
-		<description>Taikou Risshiden (Jpn)</description>
+		<description>Taikou Risshiden (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-TD" />
@@ -30071,7 +30071,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="taikyogo">
-		<description>Taikyoku Igo - Goliath (Jpn)</description>
+		<description>Taikyoku Igo - Goliath (Japan)</description>
 		<year>1993</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-IA" />
@@ -30097,7 +30097,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="takameij" cloneof="advisl">
-		<description>Takahashi Meijin no Daiboukenjima (Jpn)</description>
+		<description>Takahashi Meijin no Daiboukenjima (Japan)</description>
 		<year>1992</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-H2" />
@@ -30118,7 +30118,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="takedasc" cloneof="sgoal2">
-		<description>Takeda Nobuhiro no Super Cup Soccer (Jpn)</description>
+		<description>Takeda Nobuhiro no Super Cup Soccer (Japan)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-JV" />
@@ -30145,7 +30145,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="takedasl">
-		<description>Takeda Nobuhiro no Super League Soccer (Jpn)</description>
+		<description>Takeda Nobuhiro no Super League Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-ATKJ-JPN" />
@@ -30172,7 +30172,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tophant">
-		<description>Tales of Phantasia (Jpn)</description>
+		<description>Tales of Phantasia (Japan)</description>
 		<year>1995</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-ATVJ-JPN" />
@@ -30268,7 +30268,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tecmosb3j" cloneof="tecmosb3">
-		<description>Tecmo Super Bowl III - Final Edition (Jpn)</description>
+		<description>Tecmo Super Bowl III - Final Edition (Japan)</description>
 		<year>1995</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-AW4J-JPN" />
@@ -30295,7 +30295,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tecmonbaja" cloneof="tecmonba">
-		<description>Tecmo Super NBA Basketball (Jpn)</description>
+		<description>Tecmo Super NBA Basketball (Japan)</description>
 		<year>1992</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-NA" />
@@ -30321,7 +30321,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tecmonbaj" cloneof="tecmonba">
-		<description>Tecmo Super NBA Basketball (Jpn, Rev. A)</description>
+		<description>Tecmo Super NBA Basketball (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-NA" />
@@ -30373,7 +30373,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tmntmw" cloneof="tmnttf">
-		<description>Teenage Mutant Ninja Turtles - Mutant Warriors (Jpn)</description>
+		<description>Teenage Mutant Ninja Turtles - Mutant Warriors (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-KY" />
@@ -30414,7 +30414,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tmnt4j" cloneof="tmnt4">
-		<description>Teenage Mutant Ninja Turtles - Turtles in Time (Jpn)</description>
+		<description>Teenage Mutant Ninja Turtles - Turtles in Time (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-TM" />
@@ -30475,7 +30475,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="teiketsua" cloneof="pto">
-		<description>Teitoku no Ketsudan (Jpn)</description>
+		<description>Teitoku no Ketsudan (Japan)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-TK" />
@@ -30503,7 +30503,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="teikets2a" cloneof="pto2">
-		<description>Teitoku no Ketsudan II (Jpn)</description>
+		<description>Teitoku no Ketsudan II (Japan)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-ATEJ-JPN" />
@@ -30529,7 +30529,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="teikets2" cloneof="pto2">
-		<description>Teitoku no Ketsudan II (Jpn, Rev. A)</description>
+		<description>Teitoku no Ketsudan II (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-ATEJ-JPN" />
@@ -30556,7 +30556,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tenchi">
-		<description>Tenchi Muyou! - Game Hen (Jpn)</description>
+		<description>Tenchi Muyou! - Game Hen (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AMUJ-JPN" />
@@ -30582,7 +30582,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tenchiku">
-		<description>Tenchi wo Kurau - Sangokushi Gunyuuden (Jpn)</description>
+		<description>Tenchi wo Kurau - Sangokushi Gunyuuden (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AKTJ-JPN" />
@@ -30608,7 +30608,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tengaim0" supported="no"> <!-- unemulated additional hardware (SPC7110) -->
-		<description>Tengai Makyou Zero (Jpn)</description>
+		<description>Tengai Makyou Zero (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AZRJ-JPN" />
@@ -30677,7 +30677,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="terranigf" cloneof="terranig">
-		<description>Terranigma (Fra)</description>
+		<description>Terranigma (France)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-AQTF-FRA" />
@@ -30702,7 +30702,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="terranigga" cloneof="terranig">
-		<description>Terranigma (Ger)</description>
+		<description>Terranigma (Germany)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-AQTD-NOE" />
@@ -30808,7 +30808,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="themeprkj" cloneof="themeprk">
-		<description>Theme Park (Jpn)</description>
+		<description>Theme Park (Japan)</description>
 		<year>1995</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-ATQJ-JPN" />
@@ -30967,7 +30967,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ttoonadva" cloneof="ttoonbbl">
-		<description>Tiny Toon Adventures (Jpn)</description>
+		<description>Tiny Toon Adventures (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-TA" />
@@ -30988,7 +30988,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ttoonadv" cloneof="ttoonbbl">
-		<description>Tiny Toon Adventures (Jpn, Rev. A)</description>
+		<description>Tiny Toon Adventures (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-TA" />
@@ -31050,7 +31050,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tokimeki">
-		<description>Tokimeki Memorial - Densetsu no Ki no Shita de (Jpn, Rev. A)</description>
+		<description>Tokimeki Memorial - Densetsu no Ki no Shita de (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AM8J-JPN" />
@@ -31144,7 +31144,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="topman2">
-		<description>Top Management II (Jpn)</description>
+		<description>Top Management II (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-QC" />
@@ -31173,7 +31173,7 @@ Alternate board (XL-1)
 
 	<software name="tornekoa" cloneof="torneko">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Torneko no Daibouken - Fushigi no Dungeon (Jpn)</description>
+		<description>Torneko no Daibouken - Fushigi no Dungeon (Japan)</description>
 		<year>1993</year>
 		<publisher>Chunsoft</publisher>
 		<info name="serial" value="SHVC-TQ" />
@@ -31213,7 +31213,7 @@ Alternate board (XL-1)
 
 	<software name="torneko">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Torneko no Daibouken - Fushigi no Dungeon (Jpn, Rev. A)</description>
+		<description>Torneko no Daibouken - Fushigi no Dungeon (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Chunsoft</publisher>
 		<info name="serial" value="SHVC-TQ" />
@@ -31242,7 +31242,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tougeden">
-		<description>Touge Densetsu - Saisoku Battle (Jpn)</description>
+		<description>Touge Densetsu - Saisoku Battle (Japan)</description>
 		<year>1996</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-ACQJ-JPN" />
@@ -31307,7 +31307,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="thunterg">
-		<description>Treasure Hunter G (Jpn)</description>
+		<description>Treasure Hunter G (Japan)</description>
 		<year>1996</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AEGJ-JPN" />
@@ -31358,7 +31358,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="tsuritar">
-		<description>Tsuri Tarou (Jpn)</description>
+		<description>Tsuri Tarou (Japan)</description>
 		<year>1994</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-2O" />
@@ -31403,7 +31403,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="twinbadvj" cloneof="twinbadv">
-		<description>TwinBee - Rainbow Bell Adventure (Jpn)</description>
+		<description>TwinBee - Rainbow Bell Adventure (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-T7" />
@@ -31493,7 +31493,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ultrabb">
-		<description>Ultra Baseball Jitsumei Ban (Jpn)</description>
+		<description>Ultra Baseball Jitsumei Ban (Japan)</description>
 		<year>1992</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-U2" />
@@ -31519,7 +31519,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ultrabb3">
-		<description>Ultra Baseball Jitsumei Ban 3 (Jpn)</description>
+		<description>Ultra Baseball Jitsumei Ban 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-AU2J-JPN" />
@@ -31545,7 +31545,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ultra7">
-		<description>Ultra Seven (Jpn)</description>
+		<description>Ultra Seven (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-U7" />
@@ -31566,7 +31566,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ultramanj" cloneof="ultraman">
-		<description>Ultraman - Kuusou Tokusatsu Shiriizu (Jpn)</description>
+		<description>Ultraman - Kuusou Tokusatsu Shiriizu (Japan)</description>
 		<year>1991</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-UM" />
@@ -31587,7 +31587,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="uminushia" cloneof="uminushi">
-		<description>Umi no Nushi Tsuri (Jpn)</description>
+		<description>Umi no Nushi Tsuri (Japan)</description>
 		<year>1996</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-A6UJ-JPN" />
@@ -31664,7 +31664,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="undercop">
-		<description>Undercover Cops (Jpn)</description>
+		<description>Undercover Cops (Japan)</description>
 		<year>1995</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-AUCJ-JPN" />
@@ -31729,7 +31729,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="valdiserf" cloneof="valdiser">
-		<description>Val d'Isere Championship (Fra)</description>
+		<description>Val d'Isere Championship (France)</description>
 		<year>1994</year>
 		<publisher>Mindscape</publisher>
 		<info name="serial" value="SNSP-8V-FAH" />
@@ -31773,7 +31773,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="virtwars" cloneof="lawnmowr">
-		<description>Virtual Wars (Jpn)</description>
+		<description>Virtual Wars (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-VJ" />
@@ -31794,7 +31794,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="volleytw" cloneof="digspike">
-		<description>Volleyball Twin (Jpn)</description>
+		<description>Volleyball Twin (Japan)</description>
 		<year>1992</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-VT" />
@@ -31846,7 +31846,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="vortexj" cloneof="vortex">
-		<description>Vortex (Jpn)</description>
+		<description>Vortex (Japan)</description>
 		<year>1994</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHCV-4V" />
@@ -31874,7 +31874,7 @@ Alternate board (XL-1)
 	</software>
 <!-- wip-w -->
 	<software name="wagyanp">
-		<description>Wagyan Paradise (Jpn)</description>
+		<description>Wagyan Paradise (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-AWLJ-JPN" />
@@ -31898,7 +31898,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wakataka">
-		<description>Wakataka Oozumou - Yume no Kyoudai Taiketsu (Jpn)</description>
+		<description>Wakataka Oozumou - Yume no Kyoudai Taiketsu (Japan)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-OW" />
@@ -32015,7 +32015,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="weddingp">
-		<description>Wedding Peach (Jpn)</description>
+		<description>Wedding Peach (Japan)</description>
 		<year>1995</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AWHJ-JPN" />
@@ -32136,7 +32136,7 @@ Alternate board (XL-1)
 		<!-- Notes: The initial cartridge release contains a v1.1 rom,
 		            the shvc-cq-0 rom almost certainly never hit the stores,
 		            it could also refer to the undumped demo -->
-		<description>Wild Trax (Jpn, v1.1)</description>
+		<description>Wild Trax (Japan, v1.1)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-CQ / G713761" />
@@ -32187,7 +32187,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wingcommg" cloneof="wingcomm">
-		<description>Wing Commander (Ger)</description>
+		<description>Wing Commander (Germany)</description>
 		<year>1992</year>
 		<publisher>Mindscape</publisher>
 		<info name="serial" value="SNSP-WC-NOE/SFRG" />
@@ -32206,7 +32206,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wingcommj" cloneof="wingcomm">
-		<description>Wing Commander (Jpn)</description>
+		<description>Wing Commander (Japan)</description>
 		<year>1993</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-WC" />
@@ -32227,7 +32227,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="winposta" cloneof="winpost">
-		<description>Winning Post (Jpn)</description>
+		<description>Winning Post (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-WJ" />
@@ -32253,7 +32253,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="winpost">
-		<description>Winning Post (Jpn, Rev. A)</description>
+		<description>Winning Post (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-WJ" />
@@ -32280,7 +32280,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="winpost2">
-		<description>Winning Post 2 (Jpn)</description>
+		<description>Winning Post 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AWPJ-JPN" />
@@ -32336,7 +32336,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wizap">
-		<description>Wizap! - Ankoku no Ou (Jpn)</description>
+		<description>Wizap! - Ankoku no Ou (Japan)</description>
 		<year>1994</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-WQ" />
@@ -32363,7 +32363,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wizardr5j" cloneof="wizardr5">
-		<description>Wizardry V - Saika no Chuushin (Jpn)</description>
+		<description>Wizardry V - Saika no Chuushin (Japan)</description>
 		<year>1992</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-W5" />
@@ -32389,7 +32389,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wizardr6">
-		<description>Wizardry VI - Kindan no Mahitsu (Jpn)</description>
+		<description>Wizardry VI - Kindan no Mahitsu (Japan)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AW6J-JPN" />
@@ -32417,7 +32417,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wolfn3dj" cloneof="wolfn3d">
-		<description>Wolfenstein 3D - The Claw of Eisenfaust (Jpn)</description>
+		<description>Wolfenstein 3D - The Claw of Eisenfaust (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-6W" />
@@ -32464,7 +32464,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wcstrikrj" cloneof="wcstrikr">
-		<description>World Cup Striker (Jpn)</description>
+		<description>World Cup Striker (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-5W" />
@@ -32509,7 +32509,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="whj" cloneof="wh">
-		<description>World Heroes (Jpn)</description>
+		<description>World Heroes (Japan)</description>
 		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-WZ" />
@@ -32592,7 +32592,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="worldsocj" cloneof="worldsoc">
-		<description>World Soccer (Jpn)</description>
+		<description>World Soccer (Japan)</description>
 		<year>1993</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-WO" />
@@ -32620,7 +32620,7 @@ Alternate board (XL-1)
 
 	<software name="wrecking">
 		<!-- Notes: Re-released on a retail cart after initial release on Nintendo Power (19980101) -->
-		<description>Wrecking Crew '98 (Jpn)</description>
+		<description>Wrecking Crew '98 (Japan)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BWCJ-JPN" />
@@ -32665,7 +32665,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="wwfsupj" cloneof="wwfsup">
-		<description>WWF Super WrestleMania (Jpn)</description>
+		<description>WWF Super WrestleMania (Japan)</description>
 		<year>1992</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-WF" />
@@ -32726,7 +32726,7 @@ Alternate board (XL-1)
 	</software>
 <!-- wip-x -->
 	<software name="xzoneju" cloneof="xzone">
-		<description>X Zone (Jpn, USA)</description>
+		<description>X Zone (Japan, USA)</description>
 		<year>1992</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-XZ" />
@@ -32769,7 +32769,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="xak">
-		<description>Xak - The Art of Visual Stage (Jpn)</description>
+		<description>Xak - The Art of Visual Stage (Japan)</description>
 		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-XK" />
@@ -32798,7 +32798,7 @@ Alternate board (XL-1)
 
 	<software name="xandra" cloneof="whirlo">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Xandra no Daibouken - Valkyrie to no Deai (Jpn)</description>
+		<description>Xandra no Daibouken - Valkyrie to no Deai (Japan)</description>
 		<year>1992</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-SH" />
@@ -32819,7 +32819,7 @@ Alternate board (XL-1)
 	</software>
 <!-- wip-y -->
 	<software name="yokomsa" cloneof="yokoms">
-		<description>Yokoyama Mitsuteru Sangokushi (Jpn)</description>
+		<description>Yokoyama Mitsuteru Sangokushi (Japan)</description>
 		<year>1992</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-3G" />
@@ -32845,7 +32845,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="yokoms2">
-		<description>Yokoyama Mitsuteru Sangokushi 2 (Jpn)</description>
+		<description>Yokoyama Mitsuteru Sangokushi 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-32" />
@@ -32873,7 +32873,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="yoshirod" cloneof="yoshisaf">
-		<description>Yoshi no Road Hunting (Jpn)</description>
+		<description>Yoshi no Road Hunting (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-RH" />
@@ -32895,7 +32895,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ys3j" cloneof="ys3">
-		<description>Ys III - Wanderers from Ys (Jpn)</description>
+		<description>Ys III - Wanderers from Ys (Japan)</description>
 		<year>1991</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-YS" />
@@ -32946,7 +32946,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="ys4">
-		<description>Ys IV - Mask of the Sun (Jpn)</description>
+		<description>Ys IV - Mask of the Sun (Japan)</description>
 		<year>1993</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-Y4" />
@@ -32974,7 +32974,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="yuyu">
-		<description>Yu Yu Hakusho (Jpn)</description>
+		<description>Yu Yu Hakusho (Japan)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-YY" />
@@ -32995,7 +32995,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="yuyua" cloneof="yuyu">
-		<description>Yu Yu Hakusho (Jpn, alt)</description>
+		<description>Yu Yu Hakusho (Japan, alt)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-YY" />
@@ -33019,7 +33019,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="yuyutoku">
-		<description>Yu Yu Hakusho - Tokubetsu Hen (Jpn)</description>
+		<description>Yu Yu Hakusho - Tokubetsu Hen (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-AYYJ-JPN" />
@@ -33041,7 +33041,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="yuyu2">
-		<description>Yu Yu Hakusho 2 - Kakutou no Shou (Jpn)</description>
+		<description>Yu Yu Hakusho 2 - Kakutou no Shou (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-Y2" />
@@ -33063,7 +33063,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="yuyuquiz">
-		<description>Yuuyu no Quiz de Go! Go! (Jpn)</description>
+		<description>Yuuyu no Quiz de Go! Go! (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-UU" />
@@ -33085,7 +33085,7 @@ Alternate board (XL-1)
 <!-- wip-z -->
 	<software name="zelda3jb" cloneof="zelda3">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Zelda no Densetsu - Kamigami no Triforce (Jpn)</description>
+		<description>Zelda no Densetsu - Kamigami no Triforce (Japan)</description>
 		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ZL" />
@@ -33112,7 +33112,7 @@ Alternate board (XL-1)
 
 	<software name="zelda3ja" cloneof="zelda3">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Zelda no Densetsu - Kamigami no Triforce (Jpn, Rev. A)</description>
+		<description>Zelda no Densetsu - Kamigami no Triforce (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ZL" />
@@ -33140,7 +33140,7 @@ Alternate board (XL-1)
 
 	<software name="zelda3j" cloneof="zelda3">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Zelda no Densetsu - Kamigami no Triforce (Jpn, Rev. B)</description>
+		<description>Zelda no Densetsu - Kamigami no Triforce (Japan, Rev. B)</description>
 		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-ZL" />
@@ -33167,7 +33167,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="zenprow">
-		<description>Zen-Nihon Pro Wres (Jpn)</description>
+		<description>Zen-Nihon Pro Wres (Japan)</description>
 		<year>1993</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-JP" />
@@ -33191,7 +33191,7 @@ Alternate board (XL-1)
 	</software>
 
 	<software name="zenprow2">
-		<description>Zen-Nihon Pro Wres 2 - 3-4 Budoukan (Jpn)</description>
+		<description>Zen-Nihon Pro Wres 2 - 3-4 Budoukan (Japan)</description>
 		<year>1995</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-APRJ-JPN" />
@@ -33335,7 +33335,7 @@ Alternate board (XL-1)
 
 	<software name="doraemon">
 		<!-- single cartridge source: ototo -->
-		<description>Doraemon - Nobita to Yousei no Kuni (Jpn, Rev. A)</description>
+		<description>Doraemon - Nobita to Yousei no Kuni (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-DR" />
@@ -33357,7 +33357,7 @@ Alternate board (XL-1)
 
 	<software name="estpolisa" cloneof="lufia">
 		<!-- single cartridge source: eyedunno -->
-		<description>Estpolis Denki (Jpn, Rev. A)</description>
+		<description>Estpolis Denki (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-ES" />
@@ -33385,7 +33385,7 @@ Alternate board (XL-1)
 
 	<software name="fifa98b" cloneof="fifa98">
 		<!-- single cartridge source: bigfred -->
-		<description>FIFA - A Caminho Da Copa 98 (Bra)</description>
+		<description>FIFA - A Caminho Da Copa 98 (Brazil)</description>
 		<year>1997</year>
 		<publisher>Gradiente Entertainment Ltda.</publisher>
 		<info name="serial" value="" />
@@ -33428,7 +33428,7 @@ Alternate board (XL-1)
 
 	<software name="garou" cloneof="fatfury">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Garou Densetsu - Shukumei no Tatakai (Jpn, Rev. A)</description>
+		<description>Garou Densetsu - Shukumei no Tatakai (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-GN" />
@@ -33454,7 +33454,7 @@ Alternate board (XL-1)
 
 	<software name="granhist">
 		<!-- single cartridge source: bigfred -->
-		<description>Granhistoria - Genshi Sekaiki (Jpn, Rev. A)</description>
+		<description>Granhistoria - Genshi Sekaiki (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AIRJ-JPN" />
@@ -33482,7 +33482,7 @@ Alternate board (XL-1)
 
 	<software name="hakprogl" cloneof="extrainn">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Hakunetsu Pro Yakyuu - Ganba League (Jpn, Rev. A)</description>
+		<description>Hakunetsu Pro Yakyuu - Ganba League (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-GL (ESPG38)" />
@@ -33509,7 +33509,7 @@ Alternate board (XL-1)
 
 	<software name="haoutryu">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Haou Taikei Ryuu Knight - Lord of Paladin (Jpn, Rev. A)</description>
+		<description>Haou Taikei Ryuu Knight - Lord of Paladin (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-UR" />
@@ -33539,7 +33539,7 @@ Alternate board (XL-1)
 
 	<software name="kirbysd" cloneof="kirbyfun">
 		<!-- single cartridge source: The Dumper (supplier: Y~K) -->
-		<description>Hoshi no Kirby - Super Deluxe (Jpn, Rev. B)</description>
+		<description>Hoshi no Kirby - Super Deluxe (Japan, Rev. B)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-AKFJ-JPN / G744105" />
@@ -33567,7 +33567,7 @@ Alternate board (XL-1)
 
 	<software name="humansg" cloneof="humans">
 		<!-- single cartridge source: Zidanax -->
-		<description>The Humans (Ger)</description>
+		<description>The Humans (Germany)</description>
 		<year>1993</year>
 		<publisher>GameTek</publisher>
 		<info name="serial" value="SNSP-U9-NOE/SFRG" />
@@ -33587,7 +33587,7 @@ Alternate board (XL-1)
 
 	<software name="jlexct94" cloneof="sshotout">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>J.League Excite Stage '94 (Jpn, Rev. A)</description>
+		<description>J.League Excite Stage '94 (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-JL" />
@@ -33617,7 +33617,7 @@ Alternate board (XL-1)
 
 	<software name="powyak2a" cloneof="powyak2">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Jikkyou Powerful Pro Yakyuu 2 (Jpn, Rev. A)</description>
+		<description>Jikkyou Powerful Pro Yakyuu 2 (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AP2J-JPN" />
@@ -33648,7 +33648,7 @@ Alternate board (XL-1)
 
 	<software name="jrapata" supported="no"> <!-- unemulated additional hardware (NTT) -->
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>JRA PAT (Jpn, TJAJ)</description>
+		<description>JRA PAT (Japan, TJAJ)</description>
 		<year>1996</year>
 		<publisher>NTT</publisher>
 		<info name="serial" value="SHVC-TJAJ-JPN-S1, SHVC-TJAJ-JPN-S2" />
@@ -33673,7 +33673,7 @@ Alternate board (XL-1)
 
 	<software name="jrapatb" supported="no"> <!-- unemulated additional hardware (NTT) -->
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>JRA PAT (Jpn, TJBJ)</description>
+		<description>JRA PAT (Japan, TJBJ)</description>
 		<year>1996</year>
 		<publisher>NTT</publisher>
 		<info name="serial" value="SHVC-TJBJ-JPN-S3, SHVC-TJBJ-JPN-U1, SHVC-TJBJ-JPN-U2" />
@@ -33698,7 +33698,7 @@ Alternate board (XL-1)
 
 	<software name="jrapatd" supported="no"> <!-- unemulated additional hardware (NTT) -->
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>JRA PAT - Wide Taiyouban (Jpn, TJDJ)</description>
+		<description>JRA PAT - Wide Taiyouban (Japan, TJDJ)</description>
 		<year>1999</year>
 		<publisher>NTT</publisher>
 		<info name="serial" value="SHVC-TJDJ-JPN-P1, SHVC-TJDJ-JPN-P2" />
@@ -33724,7 +33724,7 @@ Alternate board (XL-1)
 
 	<software name="jrapate" supported="no"> <!-- unemulated additional hardware (NTT) -->
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>JRA PAT - Wide Taiyouban (Jpn, TJEJ)</description>
+		<description>JRA PAT - Wide Taiyouban (Japan, TJEJ)</description>
 		<year>1999</year>
 		<publisher>NTT</publisher>
 		<info name="serial" value="SHVC-TJEJ-JPN-P3" />
@@ -33778,7 +33778,7 @@ Alternate board (XL-1)
 
 	<software name="larrynix" cloneof="tnnbass">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Larry Nixon's Super Bass Fishing (Jpn, Rev. A)</description>
+		<description>Larry Nixon's Super Bass Fishing (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="SHVC-QJ (KIS-4)" />
@@ -33830,7 +33830,7 @@ Alternate board (XL-1)
 
 	<software name="mickeymqg1" cloneof="mickeymq">
 		<!-- single cartridge source: JohnDie -->
-		<description>The Magical Quest Starring Mickey Mouse (Ger)</description>
+		<description>The Magical Quest Starring Mickey Mouse (Germany)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SNSP-MI-NOE/SFRG" />
@@ -33850,7 +33850,7 @@ Alternate board (XL-1)
 
 	<software name="mickeymqi" cloneof="mickeymq">
 		<!-- single cartridge source: Zidanax -->
-		<description>The Magical Quest con Topolino (Ita)</description>
+		<description>The Magical Quest con Topolino (Italy)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SNSP-MI-ITA/SITA" />
@@ -33870,7 +33870,7 @@ Alternate board (XL-1)
 
 	<software name="haruaug3" supported="partial">
 		<!-- single cartridge source: The Dumper (supplier: Y~K) -->
-		<description>Masters New - Harukanaru Augusta 3 (Jpn, Rev. A)</description>
+		<description>Masters New - Harukanaru Augusta 3 (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-AO3J-JPN" />
@@ -33974,7 +33974,7 @@ Alternate board (XL-1)
 
 	<software name="paramev4">
 		<!-- single cartridge source: d4s -->
-		<description>Parame ROM Cassette 4 Gō - Super X-T Sasuke Senyō (Jpn)</description>
+		<description>Parame ROM Cassette 4 Gō - Super X-T Sasuke Senyō (Japan)</description>
 		<year>199?</year>
 		<publisher>Gametech</publisher>
 		<info name="alt_title" value="ぱらめROMカセット4号 SUPER X-Tサスケ専用" />
@@ -33989,7 +33989,7 @@ Alternate board (XL-1)
 
 	<software name="paramev5">
 		<!-- single cartridge source: d4s -->
-		<description>Parame ROM Cassette 5 Gō - Super X-T Sasuke Senyō (Jpn)</description>
+		<description>Parame ROM Cassette 5 Gō - Super X-T Sasuke Senyō (Japan)</description>
 		<year>199?</year>
 		<publisher>Gametech</publisher>
 		<info name="alt_title" value="ぱらめROMカセット5号 SUPER X-Tサスケ専用" />
@@ -34003,7 +34003,7 @@ Alternate board (XL-1)
 
 	<software name="mjkiwame">
 		<!-- single cartridge source: badinsults -->
-		<description>Pro Mahjong Kiwame (Jpn, Rev. A)</description>
+		<description>Pro Mahjong Kiwame (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-ZZ" />
@@ -34047,7 +34047,7 @@ Alternate board (XL-1)
 
 	<software name="manaf" cloneof="mana">
 		<!-- single cartridge source: badablek -->
-		<description>Secret of Mana (Fra, Rev. A)</description>
+		<description>Secret of Mana (France, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-K2-FRA/SFRA" />
@@ -34074,7 +34074,7 @@ Alternate board (XL-1)
 
 	<software name="shangban">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Shanghai - Banri no Choujou (Jpn, Rev. A)</description>
+		<description>Shanghai - Banri no Choujou (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-A4SJ-JPN" />
@@ -34097,7 +34097,7 @@ Alternate board (XL-1)
 	<software name="shinmomo">
 		<!-- single cartridge source: bigfred -->
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Shin Momotarou Densetsu (Jpn, Rev. A)</description>
+		<description>Shin Momotarou Densetsu (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-M5-1" />
@@ -34169,7 +34169,7 @@ Alternate board (XL-1)
 
 	<software name="fireprws">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Super Fire Pro Wrestling Special (Jpn, Rev. A)</description>
+		<description>Super Fire Pro Wrestling Special (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AP4J-JPN" />
@@ -34197,7 +34197,7 @@ Alternate board (XL-1)
 
 	<software name="sjinsei2">
 		<!-- single cartridge source: badinsults -->
-		<description>Super Jinsei Game 2 (Jpn, Rev. B)</description>
+		<description>Super Jinsei Game 2 (Japan, Rev. B)</description>
 		<year>1995</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-AL2J-JPN" />
@@ -34225,7 +34225,7 @@ Alternate board (XL-1)
 
 	<software name="superkyo">
 		<!-- single cartridge source: JohnDie -->
-		<description>Super Kyoutei (Jpn, Rev. A)</description>
+		<description>Super Kyoutei (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AKYJ-JPN" />
@@ -34255,7 +34255,7 @@ Alternate board (XL-1)
 
 	<software name="supermj2">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Super Mahjong 2 - Honkaku 4-nin Uchi! (Jpn, Rev. A)</description>
+		<description>Super Mahjong 2 - Honkaku 4-nin Uchi! (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-2A" />
@@ -34283,7 +34283,7 @@ Alternate board (XL-1)
 
 	<software name="supermjta" cloneof="supermjt">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Super Mahjong Taikai (Jpn, Rev. D)</description>
+		<description>Super Mahjong Taikai (Japan, Rev. D)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IQ" />
@@ -34311,7 +34311,7 @@ Alternate board (XL-1)
 
 	<software name="nobubufu" cloneof="nobuldrk">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Super Nobunaga no Yabou - Bushou Fuuunroku (Jpn, Rev. A)</description>
+		<description>Super Nobunaga no Yabou - Bushou Fuuunroku (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IZ" />
@@ -34339,7 +34339,7 @@ Alternate board (XL-1)
 
 	<software name="sshogi">
 		<!-- single cartridge source: badinsults -->
-		<description>Super Shougi (Jpn, Rev. A)</description>
+		<description>Super Shougi (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-SD" />
@@ -34367,7 +34367,7 @@ Alternate board (XL-1)
 
 	<software name="stetris2">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Super Tetris 2 + Bombliss (Jpn, Rev. A)</description>
+		<description>Super Tetris 2 + Bombliss (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-T2" />
@@ -34395,7 +34395,7 @@ Alternate board (XL-1)
 
 	<software name="swordwl2">
 		<!-- single cartridge source: bigfred -->
-		<description>Sword World SFC 2 - Inishie no Kyojin Densetsu (Jpn, Rev. A)</description>
+		<description>Sword World SFC 2 - Inishie no Kyojin Densetsu (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-7M" />
@@ -34444,7 +34444,7 @@ Alternate board (XL-1)
 
 	<software name="turnburns" cloneof="turnburn">
 		<!-- single cartridge source: Zidanax -->
-		<description>Turn and Burn - No-Fly Zone (Spa)</description>
+		<description>Turn and Burn - No-Fly Zone (Spain)</description>
 		<year>1994</year>
 		<publisher>Absolute Entertainment</publisher>
 		<info name="serial" value="SNSP-ZN-ESP/SESP" />
@@ -34503,7 +34503,7 @@ Alternate board (XL-1)
 
 	<software name="yokoms">
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Yokoyama Mitsuteru Sangokushi (Jpn, Rev. A)</description>
+		<description>Yokoyama Mitsuteru Sangokushi (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-3G" />
@@ -34531,7 +34531,7 @@ Alternate board (XL-1)
 
 	<software name="zaitaku" supported="no"> <!-- unemulated additional hardware (NTT) -->
 		<!-- single cartridge source: Yakushi~Kabuto -->
-		<description>Zaitaku Touhyou System - SPAT4-Wide (Jpn)</description>
+		<description>Zaitaku Touhyou System - SPAT4-Wide (Japan)</description>
 		<year>1996</year>
 		<publisher>NTT</publisher>
 		<info name="serial" value="SHVC-TOBJ-JPN" />
@@ -34567,7 +34567,7 @@ Alternate board (XL-1)
 -->
 
 	<software name="mechwarri" cloneof="mechwarr">
-		<description>MechWarrior (Ita)</description>
+		<description>MechWarrior (Italy)</description>
 		<year>1993</year>
 		<publisher>Activision</publisher>
 		<part name="cart" interface="snes_cart">
@@ -34582,7 +34582,7 @@ Alternate board (XL-1)
 
 	<software name="starfoxj" cloneof="starwing">
 		<!-- Notes: dumped from a Super Famicom Box, CONFIRMATION NEEDED on a retail cartridge -->
-		<description>Star Fox (Jpn, v1.1, Super Famicom Box)</description>
+		<description>Star Fox (Japan, v1.1, Super Famicom Box)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -34621,7 +34621,7 @@ List of unclassified roms
 -->
 
 	<software name="96zenko">
-		<description>'96 Zenkoku Koukou Soccer Senshuken (Jpn)</description>
+		<description>'96 Zenkoku Koukou Soccer Senshuken (Japan)</description>
 		<year>1996</year>
 		<publisher>Magical</publisher>
 		<info name="serial" value="SHVC-AY2J" />
@@ -34639,7 +34639,7 @@ List of unclassified roms
 	</software>
 
 	<software name="2020bbj" cloneof="2020bb">
-		<description>2020 Super Baseball (Jpn)</description>
+		<description>2020 Super Baseball (Japan)</description>
 		<year>1993</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="SHVC-SA" />
@@ -34654,7 +34654,7 @@ List of unclassified roms
 	</software>
 
 	<software name="3x3eyesj">
-		<description>3x3 Eyes - Juuma Houkan (Jpn)</description>
+		<description>3x3 Eyes - Juuma Houkan (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A83J" />
@@ -34671,7 +34671,7 @@ List of unclassified roms
 	</software>
 
 	<software name="3x3eyess">
-		<description>3x3 Eyes - Seima Kourinden (Jpn)</description>
+		<description>3x3 Eyes - Seima Kourinden (Japan)</description>
 		<year>1992</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-33" />
@@ -34688,7 +34688,7 @@ List of unclassified roms
 	</software>
 
 	<software name="4ninshog">
-		<description>4-nin Shougi (Jpn)</description>
+		<description>4-nin Shougi (Japan)</description>
 		<year>1995</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-AYSJ" />
@@ -34703,7 +34703,7 @@ List of unclassified roms
 	</software>
 
 	<software name="46okunen" cloneof="evo">
-		<description>46 Okunen Monogatari - Harukanaru Eden e (Jpn)</description>
+		<description>46 Okunen Monogatari - Harukanaru Eden e (Japan)</description>
 		<year>1992</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-46" />
@@ -34762,7 +34762,7 @@ List of unclassified roms
 	</software>
 
 	<software name="abcfootj" cloneof="abcfoot">
-		<description>ABC Monday Night Football (Jpn)</description>
+		<description>ABC Monday Night Football (Japan)</description>
 		<year>1993</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-N5" />
@@ -34780,7 +34780,7 @@ List of unclassified roms
 	</software>
 
 	<software name="accelebr">
-		<description>Accele Brid (Jpn)</description>
+		<description>Accele Brid (Japan)</description>
 		<year>1993</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-AY" />
@@ -34795,7 +34795,7 @@ List of unclassified roms
 	</software>
 
 	<software name="acenerae">
-		<description>Ace o Nerae! (Jpn)</description>
+		<description>Ace o Nerae! (Japan)</description>
 		<year>1993</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-EE" />
@@ -34814,7 +34814,7 @@ List of unclassified roms
 	</software>
 
 	<software name="acrobatm">
-		<description>Acrobat Mission (Jpn)</description>
+		<description>Acrobat Mission (Japan)</description>
 		<year>1992</year>
 		<publisher>Teichiku</publisher>
 		<info name="serial" value="SHVC-2T" />
@@ -34829,7 +34829,7 @@ List of unclassified roms
 	</software>
 
 	<software name="actpachi">
-		<description>Action Pachio (Jpn)</description>
+		<description>Action Pachio (Japan)</description>
 		<year>1993</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-PE" />
@@ -34858,7 +34858,7 @@ List of unclassified roms
 	</software>
 
 	<software name="actraisrg" cloneof="actraisr">
-		<description>ActRaiser (Ger)</description>
+		<description>ActRaiser (Germany)</description>
 		<year>1991</year>
 		<publisher>Enix</publisher>
 		<part name="cart" interface="snes_cart">
@@ -34909,7 +34909,7 @@ List of unclassified roms
 	</software>
 
 	<software name="addfamj" cloneof="addfam">
-		<description>The Addams Family (Jpn)</description>
+		<description>The Addams Family (Japan)</description>
 		<year>1992</year>
 		<publisher>Misawa Entertainment</publisher>
 		<info name="serial" value="SHVC-AF" />
@@ -34974,7 +34974,7 @@ List of unclassified roms
 	</software>
 
 	<software name="rocketerj" cloneof="rocketer">
-		<description>The Adventures of the Rocketeer (Jpn)</description>
+		<description>The Adventures of the Rocketeer (Japan)</description>
 		<year>1992</year>
 		<publisher>IGS</publisher>
 		<info name="serial" value="SHVC-RK" />
@@ -35041,7 +35041,7 @@ List of unclassified roms
 	</software>
 
 	<software name="airmanag" cloneof="aerobiz">
-		<description>Air Management - Oozora ni Kakeru (Jpn, Rev. A)</description>
+		<description>Air Management - Oozora ni Kakeru (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AL" />
@@ -35058,7 +35058,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ajmajonmnp" cloneof="ajmajonm">
-		<description>Akagawa Jirou Majo-tachi no Nemuri (Jpn, Rev. A, NP)</description>
+		<description>Akagawa Jirou Majo-tachi no Nemuri (Japan, Rev. A, NP)</description>
 		<year>1995</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-AAMJ" />
@@ -35076,7 +35076,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ajmajonm">
-		<description>Akagawa Jirou Majo-tachi no Nemuri (Jpn)</description>
+		<description>Akagawa Jirou Majo-tachi no Nemuri (Japan)</description>
 		<year>1995</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-AAMJ" />
@@ -35094,7 +35094,7 @@ List of unclassified roms
 	</software>
 
 	<software name="akazukin">
-		<description>Akazukin Chacha (Jpn)</description>
+		<description>Akazukin Chacha (Japan)</description>
 		<year>1996</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-ACJJ" />
@@ -35111,7 +35111,7 @@ List of unclassified roms
 	</software>
 
 	<software name="akumajoxx" cloneof="cvaniavk">
-		<description>Akumajou Dracula XX (Jpn)</description>
+		<description>Akumajou Dracula XX (Japan)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-ADZJ" />
@@ -35151,7 +35151,7 @@ List of unclassified roms
 	</software>
 
 	<software name="aladdinf" cloneof="aladdin">
-		<description>Disney's Aladdin (Fra)</description>
+		<description>Disney's Aladdin (France)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<part name="cart" interface="snes_cart">
@@ -35163,7 +35163,7 @@ List of unclassified roms
 	</software>
 
 	<software name="aladdins" cloneof="aladdin">
-		<description>Disney's Aladdin (Spa)</description>
+		<description>Disney's Aladdin (Spain)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<part name="cart" interface="snes_cart">
@@ -35199,7 +35199,7 @@ List of unclassified roms
 	</software>
 
 	<software name="alicepnt">
-		<description>Alice no Paint Adventure (Jpn)</description>
+		<description>Alice no Paint Adventure (Japan)</description>
 		<year>1995</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-AALJ" />
@@ -35215,7 +35215,7 @@ List of unclassified roms
 	</software>
 
 	<software name="alien3j" cloneof="alien3">
-		<description>Alien³ (Jpn)</description>
+		<description>Alien³ (Japan)</description>
 		<year>1993</year>
 		<publisher>Acclaim Japan</publisher>
 		<info name="serial" value="SHVC-A3" />
@@ -35254,7 +35254,7 @@ List of unclassified roms
 	</software>
 
 	<software name="avspj" cloneof="avsp">
-		<description>Aliens vs. Predator (Jpn)</description>
+		<description>Aliens vs. Predator (Japan)</description>
 		<year>1993</year>
 		<publisher>IGS</publisher>
 		<info name="serial" value="SHVC-AP" />
@@ -35281,7 +35281,7 @@ List of unclassified roms
 	</software>
 
 	<software name="spidfoes">
-		<description>The Amazing Spider-Man - Lethal Foes (Jpn)</description>
+		<description>The Amazing Spider-Man - Lethal Foes (Japan)</description>
 		<year>1995</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-ASPJ" />
@@ -35296,7 +35296,7 @@ List of unclassified roms
 	</software>
 
 	<software name="amoudan">
-		<description>America Oudan Ultra Quiz (Jpn)</description>
+		<description>America Oudan Ultra Quiz (Japan)</description>
 		<year>1992</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-UQ" />
@@ -35311,7 +35311,7 @@ List of unclassified roms
 	</software>
 
 	<software name="battldom">
-		<description>American Battle Dome (Jpn)</description>
+		<description>American Battle Dome (Japan)</description>
 		<year>1995</year>
 		<publisher>Tsukuda Original</publisher>
 		<info name="serial" value="SHVC-A5BJ" />
@@ -35327,7 +35327,7 @@ List of unclassified roms
 	</software>
 
 	<software name="agassij" cloneof="agassi">
-		<description>Andre Agassi Tennis (Jpn)</description>
+		<description>Andre Agassi Tennis (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-NY" />
@@ -35342,7 +35342,7 @@ List of unclassified roms
 	</software>
 
 	<software name="angeliqpb" cloneof="angeliq">
-		<description>Angelique - Premium Box (Jpn)</description>
+		<description>Angelique - Premium Box (Japan)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AAZJ" />
@@ -35359,7 +35359,7 @@ List of unclassified roms
 	</software>
 
 	<software name="angeliq">
-		<description>Angelique (Jpn)</description>
+		<description>Angelique (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-QE" />
@@ -35376,7 +35376,7 @@ List of unclassified roms
 	</software>
 
 	<software name="angeliqv" supported="no"> <!-- unemulated additional hardware (Voice-Kun) -->
-		<description>Angelique - Voice Fantasy (Jpn)</description>
+		<description>Angelique - Voice Fantasy (Japan)</description>
 		<year>1996</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AQLJ" />
@@ -35393,7 +35393,7 @@ List of unclassified roms
 	</software>
 
 	<software name="brutalj" cloneof="brutal">
-		<description>Animal Buranden - Brutal (Jpn)</description>
+		<description>Animal Buranden - Brutal (Japan)</description>
 		<year>1994</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-ABLJ" />
@@ -35421,7 +35421,7 @@ List of unclassified roms
 	</software>
 
 	<software name="animaniaj" cloneof="animania">
-		<description>Animaniacs (Jpn)</description>
+		<description>Animaniacs (Japan)</description>
 		<year>1997</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-ANCJ" />
@@ -35437,7 +35437,7 @@ List of unclassified roms
 	</software>
 
 	<software name="arabian">
-		<description>Arabian Nights - Sabaku no Seirei Ou (Jpn)</description>
+		<description>Arabian Nights - Sabaku no Seirei Ou (Japan)</description>
 		<year>1996</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-AAJJ-JPN" />
@@ -35454,7 +35454,7 @@ List of unclassified roms
 	</software>
 
 	<software name="arabianp" cloneof="arabian">
-		<description>Arabian Nights - Sabaku no Seirei Ou (Jpn, prototype)</description>
+		<description>Arabian Nights - Sabaku no Seirei Ou (Japan, prototype)</description>
 		<year>1996</year>
 		<publisher>Takara</publisher>
 		<part name="cart" interface="snes_cart">
@@ -35468,7 +35468,7 @@ List of unclassified roms
 	</software>
 
 	<software name="araiguma">
-		<description>Araiguma Rascal (Jpn)</description>
+		<description>Araiguma Rascal (Japan)</description>
 		<year>1994</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-R9" />
@@ -35520,7 +35520,7 @@ List of unclassified roms
 	</software>
 
 	<software name="arcusspi">
-		<description>Arcus Spirits (Jpn)</description>
+		<description>Arcus Spirits (Japan)</description>
 		<year>1993</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-A4" />
@@ -35547,7 +35547,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ardyligtjp" cloneof="ardyligt">
-		<description>Ardy Lightfoot (Jpn, prototype)</description>
+		<description>Ardy Lightfoot (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>ASCII Entertainment</publisher>
 		<part name="cart" interface="snes_cart">
@@ -35559,7 +35559,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ardyligtj" cloneof="ardyligt">
-		<description>Ardy Lightfoot (Jpn)</description>
+		<description>Ardy Lightfoot (Japan)</description>
 		<year>1993</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-A9" />
@@ -35575,7 +35575,7 @@ List of unclassified roms
 	</software>
 
 	<software name="aretha2p1" cloneof="aretha2">
-		<description>Aretha II - Ariel no Fushigi na Tabi (Jpn, prototype)</description>
+		<description>Aretha II - Ariel no Fushigi na Tabi (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Yanoman Games</publisher>
 		<part name="cart" interface="snes_cart">
@@ -35589,7 +35589,7 @@ List of unclassified roms
 	</software>
 
 	<software name="aretha2p2" cloneof="aretha2">
-		<description>Aretha II - Ariel no Fushigi na Tabi (Jpn, earlier prototype)</description>
+		<description>Aretha II - Ariel no Fushigi na Tabi (Japan, earlier prototype)</description>
 		<year>1994</year>
 		<publisher>Yanoman Games</publisher>
 		<part name="cart" interface="snes_cart">
@@ -35603,7 +35603,7 @@ List of unclassified roms
 	</software>
 
 	<software name="aretha2">
-		<description>Aretha II - Ariel no Fushigi na Tabi (Jpn)</description>
+		<description>Aretha II - Ariel no Fushigi na Tabi (Japan)</description>
 		<year>1994</year>
 		<publisher>Yanoman Games</publisher>
 		<info name="serial" value="SHVC-AREJ-JPN" />
@@ -35645,7 +35645,7 @@ List of unclassified roms
 	</software>
 
 	<software name="aryol">
-		<description>Ugoku E Ver. 2.0: Aryol (Jpn)</description>
+		<description>Ugoku E Ver. 2.0: Aryol (Japan)</description>
 		<year>1994</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-X3" />
@@ -35660,7 +35660,7 @@ List of unclassified roms
 	</software>
 
 	<software name="asahishi">
-		<description>Asahi Shinbun Rensai - Katou Hifumi Kudan Shougi - Shingiryuu (Jpn)</description>
+		<description>Asahi Shinbun Rensai - Katou Hifumi Kudan Shougi - Shingiryuu (Japan)</description>
 		<year>1995</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-A23J-JPN" />
@@ -35678,7 +35678,7 @@ List of unclassified roms
 	</software>
 
 	<software name="asameshi">
-		<description>Asameshimae Nyanko (Jpn)</description>
+		<description>Asameshimae Nyanko (Japan)</description>
 		<year>1994</year>
 		<publisher>Zamuse</publisher>
 		<info name="serial" value="SHVC-ZC" />
@@ -35693,7 +35693,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ashnojoe">
-		<description>Ashita no Joe (Jpn)</description>
+		<description>Ashita no Joe (Japan)</description>
 		<year>1992</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="SHVC-AJ" />
@@ -35720,7 +35720,7 @@ List of unclassified roms
 	</software>
 
 	<software name="atlas">
-		<description>The Atlas - Renaissance Voyager (Jpn)</description>
+		<description>The Atlas - Renaissance Voyager (Japan)</description>
 		<year>1995</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-AATJ-JPN" />
@@ -35737,7 +35737,7 @@ List of unclassified roms
 	</software>
 
 	<software name="axelayus" cloneof="axelay">
-		<description>Axelay (USA, Sample)</description>
+		<description>Axelay (USA, sample)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<part name="cart" interface="snes_cart">
@@ -35761,7 +35761,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bakumats">
-		<description>Bakumatsu Kourinden Oni (Jpn)</description>
+		<description>Bakumatsu Kourinden Oni (Japan)</description>
 		<year>1996</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A20J-JPN" />
@@ -35778,7 +35778,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bumpjima">
-		<description>Bakutou Dochers - Bumps-jima wa Oosawagi (Jpn)</description>
+		<description>Bakutou Dochers - Bumps-jima wa Oosawagi (Japan)</description>
 		<year>1994</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-ABDJ-JPN" />
@@ -35793,7 +35793,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ballbull">
-		<description>Ball Bullet Gun (Jpn)</description>
+		<description>Ball Bullet Gun (Japan)</description>
 		<year>1995</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-AAGJ-JPN" />
@@ -35811,7 +35811,7 @@ List of unclassified roms
 	</software>
 
 	<software name="3jigens" cloneof="ballz3d">
-		<description>Ballz 3D - 3-jigen Kakutou Ballz (Jpn, Sample)</description>
+		<description>Ballz 3D - 3-jigen Kakutou Ballz (Japan, sample)</description>
 		<year>1995</year>
 		<publisher>Media Rings Corporation</publisher>
 		<part name="cart" interface="snes_cart">
@@ -35843,7 +35843,7 @@ List of unclassified roms
 	</software>
 
 	<software name="barbaros">
-		<description>Barbarossa (Jpn)</description>
+		<description>Barbarossa (Japan)</description>
 		<year>1992</year>
 		<publisher>Sammy</publisher>
 		<info name="serial" value="SHVC-BK" />
@@ -35873,7 +35873,7 @@ List of unclassified roms
 	</software>
 
 	<software name="barkleyj" cloneof="barkley">
-		<description>Barkley no Power Dunk (Jpn)</description>
+		<description>Barkley no Power Dunk (Japan)</description>
 		<year>1994</year>
 		<publisher>Den'z</publisher>
 		<info name="serial" value="SHVC-I7" />
@@ -35900,7 +35900,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bassmcj" cloneof="bassmc">
-		<description>BASS Masters Classic (Jpn)</description>
+		<description>BASS Masters Classic (Japan)</description>
 		<year>1995</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-ABAJ-JPN" />
@@ -35927,7 +35927,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bastard">
-		<description>Bastard!! - Ankoku no Hakaishin (Jpn)</description>
+		<description>Bastard!! - Ankoku no Hakaishin (Japan)</description>
 		<year>1994</year>
 		<publisher>Cobra Team</publisher>
 		<info name="serial" value="SHVC-VC" />
@@ -35942,7 +35942,7 @@ List of unclassified roms
 	</software>
 
 	<software name="batmanfj" cloneof="batmanf">
-		<description>Batman Forever (Jpn)</description>
+		<description>Batman Forever (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-A3BJ-JPN" />
@@ -35969,7 +35969,7 @@ List of unclassified roms
 	</software>
 
 	<software name="battlex">
-		<description>Battle Cross (Jpn)</description>
+		<description>Battle Cross (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-ABCJ-JPN" />
@@ -35984,7 +35984,7 @@ List of unclassified roms
 	</software>
 
 	<software name="battlejo">
-		<description>Battle Jockey (Jpn)</description>
+		<description>Battle Jockey (Japan)</description>
 		<year>1994</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AV2J-JPN" />
@@ -35999,7 +35999,7 @@ List of unclassified roms
 	</software>
 
 	<software name="batlmast">
-		<description>Battle Master - Kyuukyoku no Senshi-tachi (Jpn)</description>
+		<description>Battle Master - Kyuukyoku no Senshi-tachi (Japan)</description>
 		<year>1993</year>
 		<publisher>Toshiba</publisher>
 		<info name="serial" value="SHVC-5B (TOPN-2005)" />
@@ -36014,7 +36014,7 @@ List of unclassified roms
 	</software>
 
 	<software name="batlpinb">
-		<description>Battle Pinball (Jpn)</description>
+		<description>Battle Pinball (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ABPJ-JPN" />
@@ -36029,7 +36029,7 @@ List of unclassified roms
 	</software>
 
 	<software name="batlrace">
-		<description>Battle Racers (Jpn)</description>
+		<description>Battle Racers (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ACRJ-JPN" />
@@ -36046,7 +36046,7 @@ List of unclassified roms
 	</software>
 
 	<software name="batlrobo">
-		<description>Battle Robot Retsuden (Jpn)</description>
+		<description>Battle Robot Retsuden (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ABRJ-JPN" />
@@ -36063,7 +36063,7 @@ List of unclassified roms
 	</software>
 
 	<software name="battlsub">
-		<description>Battle Submarine (Jpn)</description>
+		<description>Battle Submarine (Japan)</description>
 		<year>1995</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-A5LJ-JPN" />
@@ -36078,7 +36078,7 @@ List of unclassified roms
 	</software>
 
 	<software name="battlety">
-		<description>Battle Tycoon - Flash Hiders SFX (Jpn, Rev. A)</description>
+		<description>Battle Tycoon - Flash Hiders SFX (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Right Stuff</publisher>
 		<info name="serial" value="SHVC-AFHJ-JPN" />
@@ -36095,7 +36095,7 @@ List of unclassified roms
 	</software>
 
 	<software name="batlzequ">
-		<description>Battle Zeque Den (Jpn)</description>
+		<description>Battle Zeque Den (Japan)</description>
 		<year>1994</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-ZQ" />
@@ -36110,7 +36110,7 @@ List of unclassified roms
 	</software>
 
 	<software name="btech" cloneof="mechwarr">
-		<description>BattleTech (Jpn)</description>
+		<description>BattleTech (Japan)</description>
 		<year>1993</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="serial" value="SHVC-V5" />
@@ -36127,7 +36127,7 @@ List of unclassified roms
 	</software>
 
 	<software name="btec3050" cloneof="mech3050">
-		<description>BattleTech 3050 (Jpn)</description>
+		<description>BattleTech 3050 (Japan)</description>
 		<year>1996</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-A35J-JPN" />
@@ -36142,7 +36142,7 @@ List of unclassified roms
 	</software>
 
 	<software name="btoadsj" cloneof="btoads">
-		<description>Battletoads in Battlemaniacs (Jpn)</description>
+		<description>Battletoads in Battlemaniacs (Japan)</description>
 		<year>1994</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-8T" />
@@ -36169,7 +36169,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bazoe">
-		<description>Bazoe! Mahou Sekai (Jpn)</description>
+		<description>Bazoe! Mahou Sekai (Japan)</description>
 		<year>1993</year>
 		<publisher>Hot-B</publisher>
 		<info name="serial" value="SHVC-VM" />
@@ -36235,7 +36235,7 @@ List of unclassified roms
 	</software>
 
 	<software name="benkei">
-		<description>Benkei Gaiden - Suna no Shou (Jpn)</description>
+		<description>Benkei Gaiden - Suna no Shou (Japan)</description>
 		<year>1992</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-B0" />
@@ -36276,7 +36276,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bestshot">
-		<description>Best Shot Pro Golf (Jpn)</description>
+		<description>Best Shot Pro Golf (Japan)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AG6J-JPN" />
@@ -36293,7 +36293,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bigpslo2">
-		<description>Big Ichigeki! Pachi-Slot Daikouryaku 2 - Universal Collection (Jpn)</description>
+		<description>Big Ichigeki! Pachi-Slot Daikouryaku 2 - Universal Collection (Japan)</description>
 		<year>1995</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-AUVJ-JPN" />
@@ -36364,7 +36364,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bikedais">
-		<description>Bike Daisuki! Hashiriya Tamashii (Jpn)</description>
+		<description>Bike Daisuki! Hashiriya Tamashii (Japan)</description>
 		<year>1994</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-ARSJ-JPN" />
@@ -36411,7 +36411,7 @@ List of unclassified roms
 	</software>
 
 	<software name="biometalj" cloneof="biometal">
-		<description>BioMetal (Jpn)</description>
+		<description>BioMetal (Japan)</description>
 		<year>1993</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-BV" />
@@ -36426,7 +36426,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bishinzk">
-		<description>Bishin Densetsu Zoku (Jpn)</description>
+		<description>Bishin Densetsu Zoku (Japan)</description>
 		<year>1993</year>
 		<publisher>Magifact</publisher>
 		<info name="serial" value="SHVC-ZK" />
@@ -36441,7 +36441,7 @@ List of unclassified roms
 	</software>
 
 	<software name="suchipai">
-		<description>Bishoujo Janshi Suchie-Pai (Jpn, Rev. A)</description>
+		<description>Bishoujo Janshi Suchie-Pai (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-JS" />
@@ -36456,7 +36456,7 @@ List of unclassified roms
 	</software>
 
 	<software name="suchipai1" cloneof="suchipai">
-		<description>Bishoujo Janshi Suchie-Pai (Jpn)</description>
+		<description>Bishoujo Janshi Suchie-Pai (Japan)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-JS" />
@@ -36471,7 +36471,7 @@ List of unclassified roms
 	</software>
 
 	<software name="sailoras">
-		<description>Bishoujo Senshi Sailormoon - Another Story (Jpn)</description>
+		<description>Bishoujo Senshi Sailormoon - Another Story (Japan)</description>
 		<year>1995</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-AASJ-JPN" />
@@ -36488,7 +36488,7 @@ List of unclassified roms
 	</software>
 
 	<software name="sailorsp">
-		<description>Bishoujo Senshi Sailormoon S - Kondo wa Puzzle de Oshioki yo! (Jpn)</description>
+		<description>Bishoujo Senshi Sailormoon S - Kondo wa Puzzle de Oshioki yo! (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-3Q" />
@@ -36503,7 +36503,7 @@ List of unclassified roms
 	</software>
 
 	<software name="sailorsk">
-		<description>Bishoujo Senshi Sailormoon S - Kurukkurin (Jpn)</description>
+		<description>Bishoujo Senshi Sailormoon S - Kurukkurin (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AILJ-JPN" />
@@ -36518,7 +36518,7 @@ List of unclassified roms
 	</software>
 
 	<software name="sailorfp">
-		<description>Bishoujo Senshi Sailormoon Super S - Fuwafuwa Panic (Jpn)</description>
+		<description>Bishoujo Senshi Sailormoon Super S - Fuwafuwa Panic (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-A9PJ-JPN" />
@@ -36533,7 +36533,7 @@ List of unclassified roms
 	</software>
 
 	<software name="sailorss">
-		<description>Bishoujo Senshi Sailormoon Super S - Zenin Sanka!! Shuyaku Soudatsusen (Jpn)</description>
+		<description>Bishoujo Senshi Sailormoon Super S - Zenin Sanka!! Shuyaku Soudatsusen (Japan)</description>
 		<year>1996</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-AJQJ-JPN" />
@@ -36548,7 +36548,7 @@ List of unclassified roms
 	</software>
 
 	<software name="blizyuki">
-		<description>Bishoujo Wrestler Retsuden - Blizzard Yuki Rannyuu!! (Jpn)</description>
+		<description>Bishoujo Wrestler Retsuden - Blizzard Yuki Rannyuu!! (Japan)</description>
 		<year>1996</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-A3QJ-JPN" />
@@ -36577,7 +36577,7 @@ List of unclassified roms
 	</software>
 
 	<software name="blackthrj" cloneof="blackhwk">
-		<description>Blackthorne (Jpn)</description>
+		<description>Blackthorne (Japan)</description>
 		<year>1995</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-6Z" />
@@ -36604,7 +36604,7 @@ List of unclassified roms
 	</software>
 
 	<software name="blockkuz">
-		<description>Block Kuzushi (Jpn)</description>
+		<description>Block Kuzushi (Japan)</description>
 		<year>1995</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-AB8J-JPN" />
@@ -36631,7 +36631,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bluesbj" cloneof="bluesb">
-		<description>The Blues Brothers (Jpn)</description>
+		<description>The Blues Brothers (Japan)</description>
 		<year>1993</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-B6" />
@@ -36646,7 +36646,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bokujom" cloneof="harvmoon">
-		<description>Bokujou Monogatari (Jpn, Rev. A)</description>
+		<description>Bokujou Monogatari (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-AYWJ-JPN" />
@@ -36663,7 +36663,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bombuzal" cloneof="kablooey">
-		<description>Bombuzal (Jpn)</description>
+		<description>Bombuzal (Japan)</description>
 		<year>1990</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-BB" />
@@ -36678,7 +36678,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bonkersj" cloneof="bonkers">
-		<description>Disney's Bonkers - Hollywood Daisakusen! (Jpn)</description>
+		<description>Disney's Bonkers - Hollywood Daisakusen! (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-ABNJ-JPN" />
@@ -36705,7 +36705,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bountysw">
-		<description>Bounty Sword (Jpn)</description>
+		<description>Bounty Sword (Japan)</description>
 		<year>1995</year>
 		<publisher>Pioneer</publisher>
 		<info name="serial" value="SHVC-A2LJ-JPN" />
@@ -36722,7 +36722,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bountyswp" cloneof="bountysw">
-		<description>Bounty Sword (Jpn, prototype 19950516)</description>
+		<description>Bounty Sword (Japan, prototype 19950516)</description>
 		<year>1995</year>
 		<publisher>Pioneer</publisher>
 		<part name="cart" interface="snes_cart">
@@ -36748,7 +36748,7 @@ List of unclassified roms
 	</software>
 
 	<software name="brainlrdj" cloneof="brainlrd">
-		<description>Brain Lord (Jpn)</description>
+		<description>Brain Lord (Japan)</description>
 		<year>1994</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-3B" />
@@ -36801,7 +36801,7 @@ List of unclassified roms
 	</software>
 
 	<software name="brandishj" cloneof="brandish">
-		<description>Brandish (Jpn)</description>
+		<description>Brandish (Japan)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-QF" />
@@ -36818,7 +36818,7 @@ List of unclassified roms
 	</software>
 
 	<software name="brand2ex">
-		<description>Brandish 2 - Expert (Jpn)</description>
+		<description>Brandish 2 - Expert (Japan)</description>
 		<year>1996</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AQIJ-JPN" />
@@ -36835,7 +36835,7 @@ List of unclassified roms
 	</software>
 
 	<software name="brand2pb">
-		<description>Brandish 2 - The Planet Buster (Jpn)</description>
+		<description>Brandish 2 - The Planet Buster (Japan)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AQGJ-JPN" />
@@ -36878,7 +36878,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bof2jnp" cloneof="bof2">
-		<description>Breath of Fire II (Jpn, Rev. A, NP)</description>
+		<description>Breath of Fire II (Japan, Rev. A, NP)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AF2J-JPN" />
@@ -36967,7 +36967,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bugsbhac" cloneof="bugsbrab">
-		<description>Bugs Bunny - Hachamecha Daibouken (Jpn)</description>
+		<description>Bugs Bunny - Hachamecha Daibouken (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-R7" />
@@ -37033,7 +37033,7 @@ List of unclassified roms
 	</software>
 
 	<software name="burai">
-		<description>Burai - Hachigyoku no Yuushi Densetsu (Jpn)</description>
+		<description>Burai - Hachigyoku no Yuushi Densetsu (Japan)</description>
 		<year>1993</year>
 		<publisher>IGS</publisher>
 		<info name="serial" value="SHVC-BI" />
@@ -37050,7 +37050,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bushisei">
-		<description>Bushi Seiryuuden - Futari no Yuusha (Jpn)</description>
+		<description>Bushi Seiryuuden - Futari no Yuusha (Japan)</description>
 		<year>1997</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-AYUJ-JPN" />
@@ -37068,7 +37068,7 @@ List of unclassified roms
 	</software>
 
 	<software name="cacomaj" cloneof="cacoma">
-		<description>Cacoma Knight (Jpn)</description>
+		<description>Cacoma Knight (Japan)</description>
 		<year>1992</year>
 		<publisher>Datam Polystar</publisher>
 		<info name="serial" value="SHVC-CC" />
@@ -37108,7 +37108,7 @@ List of unclassified roms
 	</software>
 
 	<software name="calgame2j" cloneof="calgame2">
-		<description>California Games II (Jpn)</description>
+		<description>California Games II (Japan)</description>
 		<year>1993</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-H9" />
@@ -37124,7 +37124,7 @@ List of unclassified roms
 
 	<software name="cameltry" cloneof="onthebal">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Cameltry (Jpn)</description>
+		<description>Cameltry (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-CT" />
@@ -37163,7 +37163,7 @@ List of unclassified roms
 	</software>
 
 	<software name="captcommj" cloneof="captcomm">
-		<description>Captain Commando (Jpn)</description>
+		<description>Captain Commando (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-QM" />
@@ -37190,7 +37190,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ctsubaj">
-		<description>Captain Tsubasa J - The Way to World Youth (Jpn)</description>
+		<description>Captain Tsubasa J - The Way to World Youth (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-ACVJ-JPN" />
@@ -37205,7 +37205,7 @@ List of unclassified roms
 	</software>
 
 	<software name="caravan">
-		<description>Caravan Shooting Collection (Jpn)</description>
+		<description>Caravan Shooting Collection (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AS8J-JPN" />
@@ -37220,7 +37220,7 @@ List of unclassified roms
 	</software>
 
 	<software name="cardmstr" cloneof="arcana">
-		<description>Card Master - Rimusaria no Fuuin (Jpn)</description>
+		<description>Card Master - Rimusaria no Fuuin (Japan)</description>
 		<year>1992</year>
 		<publisher>HAL Laboratory</publisher>
 		<info name="serial" value="SHVC-RF" />
@@ -37249,7 +37249,7 @@ List of unclassified roms
 	</software>
 
 	<software name="carrierj" cloneof="carrier">
-		<description>Carrier Aces (Jpn)</description>
+		<description>Carrier Aces (Japan)</description>
 		<year>1995</year>
 		<publisher>Yumedia</publisher>
 		<info name="serial" value="SHVC-ACAJ-JPN" />
@@ -37264,7 +37264,7 @@ List of unclassified roms
 	</software>
 
 	<software name="casperj">
-		<description>Casper (Jpn)</description>
+		<description>Casper (Japan)</description>
 		<year>1997</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AC4J-JPN" />
@@ -37318,7 +37318,7 @@ List of unclassified roms
 	</software>
 
 	<software name="chaoseed">
-		<description>Chaos Seed - Fuusui Kairouki (Jpn)</description>
+		<description>Chaos Seed - Fuusui Kairouki (Japan)</description>
 		<year>1996</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-AAHJ-JPN" />
@@ -37361,7 +37361,7 @@ List of unclassified roms
 	</software>
 
 	<software name="chessmstj" cloneof="chessmst">
-		<description>The Chessmaster (Jpn)</description>
+		<description>The Chessmaster (Japan)</description>
 		<year>1995</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-CH" />
@@ -37388,7 +37388,7 @@ List of unclassified roms
 	</software>
 
 	<software name="chibimme">
-		<description>Chibi Maruko-chan - Mezase! Minami no Island!! (Jpn)</description>
+		<description>Chibi Maruko-chan - Mezase! Minami no Island!! (Japan)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AT8J-JPN" />
@@ -37404,7 +37404,7 @@ List of unclassified roms
 	</software>
 
 	<software name="chibimmes" cloneof="chibimme">
-		<description>Chibi Maruko-chan - Mezase! Minami no Island!! (Jpn, Sample)</description>
+		<description>Chibi Maruko-chan - Mezase! Minami no Island!! (Japan, sample)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AT8J-JPN" />
@@ -37420,7 +37420,7 @@ List of unclassified roms
 	</software>
 
 	<software name="chinhai">
-		<description>Chinhai (Jpn)</description>
+		<description>Chinhai (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-APEJ-JPN" />
@@ -37450,7 +37450,7 @@ List of unclassified roms
 	</software>
 
 	<software name="choplft3j" cloneof="choplft3">
-		<description>Choplifter III - Rescue &amp; Survive (Jpn)</description>
+		<description>Choplifter III - Rescue &amp; Survive (Japan)</description>
 		<year>1994</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-3C" />
@@ -37465,7 +37465,7 @@ List of unclassified roms
 	</software>
 
 	<software name="choaniki">
-		<description>Chou Aniki - Bakuretsu Rantou Hen (Jpn)</description>
+		<description>Chou Aniki - Bakuretsu Rantou Hen (Japan)</description>
 		<year>1995</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-AANJ-JPN" />
@@ -37480,7 +37480,7 @@ List of unclassified roms
 	</software>
 
 	<software name="macross">
-		<description>Choujikuu Yousai Macross - Scrambled Valkyrie (Jpn)</description>
+		<description>Choujikuu Yousai Macross - Scrambled Valkyrie (Japan)</description>
 		<year>1993</year>
 		<publisher>Zamuse</publisher>
 		<info name="serial" value="SHVC-M9" />
@@ -37495,7 +37495,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ctriggerjs" cloneof="ctrigger">
-		<description>Chrono Trigger (Jpn, Sample)</description>
+		<description>Chrono Trigger (Japan, sample)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<part name="cart" interface="snes_cart">
@@ -37533,7 +37533,7 @@ List of unclassified roms
 	</software>
 
 	<software name="circuit" cloneof="kylepett">
-		<description>Circuit USA (Jpn)</description>
+		<description>Circuit USA (Japan)</description>
 		<year>1995</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AKPJ-JPN" />
@@ -37577,7 +37577,7 @@ List of unclassified roms
 	</software>
 
 	<software name="civilizj" cloneof="civiliz">
-		<description>Sid Meier's Civilization (Jpn)</description>
+		<description>Sid Meier's Civilization (Japan)</description>
 		<year>1994</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-EQ" />
@@ -37594,7 +37594,7 @@ List of unclassified roms
 	</software>
 
 	<software name="classrod">
-		<description>Classic Road (Jpn)</description>
+		<description>Classic Road (Japan)</description>
 		<year>1993</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-V7" />
@@ -37611,7 +37611,7 @@ List of unclassified roms
 	</software>
 
 	<software name="classro2">
-		<description>Classic Road II (Jpn)</description>
+		<description>Classic Road II (Japan)</description>
 		<year>1995</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-AV5J-JPN" />
@@ -37706,7 +37706,7 @@ List of unclassified roms
 	</software>
 
 	<software name="claymateus" cloneof="claymate">
-		<description>Claymates (USA, Sample)</description>
+		<description>Claymates (USA, sample)</description>
 		<year>1994</year>
 		<publisher>Interplay</publisher>
 		<part name="cart" interface="snes_cart">
@@ -37730,7 +37730,7 @@ List of unclassified roms
 	</software>
 
 	<software name="clocktow">
-		<description>Clock Tower (Jpn)</description>
+		<description>Clock Tower (Japan)</description>
 		<year>1995</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AJEJ-JPN" />
@@ -37748,7 +37748,7 @@ List of unclassified roms
 	</software>
 
 	<software name="clockwer">
-		<description>Clockwerx (Jpn)</description>
+		<description>Clockwerx (Japan)</description>
 		<year>1995</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="SHVC-AQWJ-JPN" />
@@ -37765,7 +37765,7 @@ List of unclassified roms
 	</software>
 
 	<software name="columns">
-		<description>Columns (Jpn, NP)</description>
+		<description>Columns (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Media Factory</publisher>
 		<info name="serial" value="SHVC-BCLJ-JPN" />
@@ -37782,7 +37782,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ctribej" cloneof="ctribe">
-		<description>The Combatribes (Jpn)</description>
+		<description>The Combatribes (Japan)</description>
 		<year>1992</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-CR" />
@@ -37822,7 +37822,7 @@ List of unclassified roms
 
 	<software name="contrasp" cloneof="sprobot">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Contra Spirits (Jpn)</description>
+		<description>Contra Spirits (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-CS" />
@@ -37837,7 +37837,7 @@ List of unclassified roms
 	</software>
 
 	<software name="contraspd" cloneof="sprobot">
-		<description>Contra Spirits (Jpn, Demo)</description>
+		<description>Contra Spirits (Japan, demo)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="alt_title" value="魂斗羅スピリッツ" />
@@ -37850,7 +37850,7 @@ List of unclassified roms
 	</software>
 
 	<software name="conveni">
-		<description>Conveni Wars Barcode Battler Senki - Super Senshi Shutsugeki seyo! (Jpn)</description>
+		<description>Conveni Wars Barcode Battler Senki - Super Senshi Shutsugeki seyo! (Japan)</description>
 		<year>1993</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-B5" />
@@ -37867,7 +37867,7 @@ List of unclassified roms
 	</software>
 
 	<software name="coolspotj" cloneof="coolspot">
-		<description>Cool Spot (Jpn)</description>
+		<description>Cool Spot (Japan)</description>
 		<year>1993</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-C8" />
@@ -37894,7 +37894,7 @@ List of unclassified roms
 	</software>
 
 	<software name="coolwrlds" cloneof="coolwrld">
-		<description>Cool World (Spa)</description>
+		<description>Cool World (Spain)</description>
 		<year>1993</year>
 		<publisher>Ocean</publisher>
 		<part name="cart" interface="snes_cart">
@@ -37906,7 +37906,7 @@ List of unclassified roms
 	</software>
 
 	<software name="coolsknk">
-		<description>Cooly Skunk (Jpn, prototype)</description>
+		<description>Cooly Skunk (Japan, prototype)</description>
 		<year>1996</year>
 		<publisher>Visit</publisher>
 		<part name="cart" interface="snes_cart">
@@ -37942,7 +37942,7 @@ List of unclassified roms
 	</software>
 
 	<software name="coronlnd">
-		<description>Coron Land (Jpn)</description>
+		<description>Coron Land (Japan)</description>
 		<year>1995</year>
 		<publisher>Yumedia</publisher>
 		<info name="serial" value="SHVC-ACLJ-JPN" />
@@ -37959,7 +37959,7 @@ List of unclassified roms
 
 	<software name="cosmopzl">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Cosmo Gang - The Puzzle (Jpn)</description>
+		<description>Cosmo Gang - The Puzzle (Japan)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-CI" />
@@ -37975,7 +37975,7 @@ List of unclassified roms
 
 	<software name="cosmogng">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Cosmo Gang - The Video (Jpn)</description>
+		<description>Cosmo Gang - The Video (Japan)</description>
 		<year>1992</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-CA" />
@@ -37990,7 +37990,7 @@ List of unclassified roms
 	</software>
 
 	<software name="galivan2">
-		<description>Cosmo Police Galivan II - Arrow of Justice (Jpn)</description>
+		<description>Cosmo Police Galivan II - Arrow of Justice (Japan)</description>
 		<year>1993</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-GI" />
@@ -38005,7 +38005,7 @@ List of unclassified roms
 	</software>
 
 	<software name="crystalb">
-		<description>Crystal Beans From Dungeon Explorer (Jpn)</description>
+		<description>Crystal Beans From Dungeon Explorer (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AC3J-JPN" />
@@ -38034,7 +38034,7 @@ List of unclassified roms
 	</software>
 
 	<software name="cyknigh2">
-		<description>Cyber Knight II - Chikyuu Teikoku no Yabou (Jpn)</description>
+		<description>Cyber Knight II - Chikyuu Teikoku no Yabou (Japan)</description>
 		<year>1994</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-CZ" />
@@ -38052,7 +38052,7 @@ List of unclassified roms
 	</software>
 
 	<software name="cyborg9p" cloneof="cyborg9">
-		<description>Cyborg 009 (Jpn, prototype)</description>
+		<description>Cyborg 009 (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>BEC</publisher>
 		<part name="cart" interface="snes_cart">
@@ -38064,7 +38064,7 @@ List of unclassified roms
 	</software>
 
 	<software name="cyborg9">
-		<description>Cyborg 009 (Jpn)</description>
+		<description>Cyborg 009 (Japan)</description>
 		<year>1994</year>
 		<publisher>BEC</publisher>
 		<info name="serial" value="SHVC-S9" />
@@ -38079,7 +38079,7 @@ List of unclassified roms
 	</software>
 
 	<software name="srobot3a" cloneof="srobot3">
-		<description>Dai-3-ji Super Robot Taisen (Jpn, Rev. A)</description>
+		<description>Dai-3-ji Super Robot Taisen (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-RT" />
@@ -38097,7 +38097,7 @@ List of unclassified roms
 	</software>
 
 	<software name="srobot3b" cloneof="srobot3">
-		<description>Dai-3-ji Super Robot Taisen (Jpn)</description>
+		<description>Dai-3-ji Super Robot Taisen (Japan)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-RT" />
@@ -38115,7 +38115,7 @@ List of unclassified roms
 	</software>
 
 	<software name="srobot4">
-		<description>Dai-4-ji Super Robot Taisen (Jpn, Rev. A)</description>
+		<description>Dai-4-ji Super Robot Taisen (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AR4J-JPN" />
@@ -38133,7 +38133,7 @@ List of unclassified roms
 	</software>
 
 	<software name="daibakjznp" cloneof="daibakjz">
-		<description>Daibakushou Jinsei Gekijou - Zukkoke Salaryman Hen (Jpn, Rev. A, NP)</description>
+		<description>Daibakushou Jinsei Gekijou - Zukkoke Salaryman Hen (Japan, Rev. A, NP)</description>
 		<year>1995</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-AZSJ-JPN" />
@@ -38150,7 +38150,7 @@ List of unclassified roms
 	</software>
 
 	<software name="daimonog">
-		<description>Daikaijuu Monogatari (Jpn, Rev. A)</description>
+		<description>Daikaijuu Monogatari (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-ADKJ-JPN" />
@@ -38167,7 +38167,7 @@ List of unclassified roms
 	</software>
 
 	<software name="daisenx2">
-		<description>Daisenryaku Expert WWII - War in Europe (Jpn)</description>
+		<description>Daisenryaku Expert WWII - War in Europe (Japan)</description>
 		<year>1997</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AEVJ-JPN" />
@@ -38185,7 +38185,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dariusfc" cloneof="snova">
-		<description>Darius Force (Jpn)</description>
+		<description>Darius Force (Japan)</description>
 		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-DH" />
@@ -38212,7 +38212,7 @@ List of unclassified roms
 	</software>
 
 	<software name="darkhalf">
-		<description>Dark Half (Jpn)</description>
+		<description>Dark Half (Japan)</description>
 		<year>1996</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AHLJ-JPN" />
@@ -38229,7 +38229,7 @@ List of unclassified roms
 	</software>
 
 	<software name="darkking">
-		<description>Dark Kingdom (Jpn)</description>
+		<description>Dark Kingdom (Japan)</description>
 		<year>1994</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-QA" />
@@ -38246,7 +38246,7 @@ List of unclassified roms
 	</software>
 
 	<software name="darklaw">
-		<description>Dark Law - Meaning of Death (Jpn)</description>
+		<description>Dark Law - Meaning of Death (Japan)</description>
 		<year>1997</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-ADUJ-JPN" />
@@ -38264,7 +38264,7 @@ List of unclassified roms
 	</software>
 
 	<software name="vtennis">
-		<description>Date Kimiko no Virtual Tennis (Jpn)</description>
+		<description>Date Kimiko no Virtual Tennis (Japan)</description>
 		<year>1994</year>
 		<publisher>B-AI</publisher>
 		<info name="serial" value="SHVC-VI" />
@@ -38291,7 +38291,7 @@ List of unclassified roms
 	</software>
 
 	<software name="amazntenj" cloneof="amaznten">
-		<description>David Crane's Amazing Tennis (Jpn)</description>
+		<description>David Crane's Amazing Tennis (Japan)</description>
 		<year>1992</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-ZT" />
@@ -38318,7 +38318,7 @@ List of unclassified roms
 	</software>
 
 	<software name="deaetono">
-		<description>Deae Tonosama - Appare Ichiban (Jpn)</description>
+		<description>Deae Tonosama - Appare Ichiban (Japan)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-ADTJ-JPN" />
@@ -38334,7 +38334,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dearboys">
-		<description>Dear Boys (Jpn)</description>
+		<description>Dear Boys (Japan)</description>
 		<year>1994</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-9Y" />
@@ -38364,7 +38364,7 @@ List of unclassified roms
 	</software>
 
 	<software name="deathbra">
-		<description>Death Brade (Jpn)</description>
+		<description>Death Brade (Japan)</description>
 		<year>1993</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-DZ" />
@@ -38380,7 +38380,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dekitate">
-		<description>Dekitate High School (Jpn)</description>
+		<description>Dekitate High School (Japan)</description>
 		<year>1995</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-ADHJ-JPN" />
@@ -38409,7 +38409,7 @@ List of unclassified roms
 	</software>
 
 	<software name="demonblz" cloneof="demoncrt">
-		<description>Demon's Blazon - Makaimura Monshou Hen (Jpn)</description>
+		<description>Demon's Blazon - Makaimura Monshou Hen (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-3Z" />
@@ -38448,7 +38448,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ogrebatlnp" cloneof="ogrebatl">
-		<description>Densetsu no Ogre Battle - The March of the Black Queen (Jpn, NP)</description>
+		<description>Densetsu no Ogre Battle - The March of the Black Queen (Japan, NP)</description>
 		<year>1993</year>
 		<publisher>Quest</publisher>
 		<part name="cart" interface="snes_cart">
@@ -38463,7 +38463,7 @@ List of unclassified roms
 
 	<software name="ogrebatlj" cloneof="ogrebatl">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Densetsu no Ogre Battle - The March of the Black Queen (Jpn)</description>
+		<description>Densetsu no Ogre Battle - The March of the Black Queen (Japan)</description>
 		<year>1993</year>
 		<publisher>Quest</publisher>
 		<info name="serial" value="SHVC-OB" />
@@ -38480,7 +38480,7 @@ List of unclassified roms
 	</software>
 
 	<software name="derbyjo2" supported="partial">
-		<description>Derby Jockey 2 (Jpn)</description>
+		<description>Derby Jockey 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-A2DJ-JPN" />
@@ -38498,7 +38498,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dstall98">
-		<description>Derby Stallion 98 (Jpn, NP)</description>
+		<description>Derby Stallion 98 (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BDBJ-JPN" />
@@ -38515,7 +38515,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dstall3b" cloneof="dstall3">
-		<description>Derby Stallion III (Jpn, Rev. A)</description>
+		<description>Derby Stallion III (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AD3J-JPN" />
@@ -38560,7 +38560,7 @@ List of unclassified roms
 	</software>
 
 	<software name="desertfj" cloneof="desertf">
-		<description>Desert Fighter - Suna no Arashi Sakusen (Jpn)</description>
+		<description>Desert Fighter - Suna no Arashi Sakusen (Japan)</description>
 		<year>1994</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-OS" />
@@ -38589,7 +38589,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dstrikej" cloneof="dstrike">
-		<description>Desert Strike - Return to the Gulf (Jpn)</description>
+		<description>Desert Strike - Return to the Gulf (Japan)</description>
 		<year>1993</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-RG" />
@@ -38604,7 +38604,7 @@ List of unclassified roms
 	</software>
 
 	<software name="destruct" cloneof="bazooka">
-		<description>Destructive (Jpn)</description>
+		<description>Destructive (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-EA" />
@@ -38619,7 +38619,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dharma">
-		<description>Dharma Doujou (Jpn)</description>
+		<description>Dharma Doujou (Japan)</description>
 		<year>1995</year>
 		<publisher>Den'Z</publisher>
 		<info name="serial" value="SHVC-ADRJ-JPN" />
@@ -38650,7 +38650,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dimensfc" cloneof="dforce">
-		<description>Dimension-Force (Jpn)</description>
+		<description>Dimension-Force (Japan)</description>
 		<year>1991</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-DF" />
@@ -38704,7 +38704,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dinowars" cloneof="dinocity">
-		<description>Dinowars - Kyouryuu Oukoku e no Daibouken (Jpn)</description>
+		<description>Dinowars - Kyouryuu Oukoku e no Daibouken (Japan)</description>
 		<year>1992</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="SHVC-DW" />
@@ -38735,7 +38735,7 @@ List of unclassified roms
 	</software>
 
 	<software name="doremifa">
-		<description>Do-Re-Mi Fantasy - Milon no Dokidoki Daibouken (Jpn)</description>
+		<description>Do-Re-Mi Fantasy - Milon no Dokidoki Daibouken (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AM4J-JPN" />
@@ -38750,7 +38750,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dokap321">
-		<description>Dokapon 3-2-1 - Arashi o Yobu Yuujou (Jpn, Rev. A)</description>
+		<description>Dokapon 3-2-1 - Arashi o Yobu Yuujou (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-AIXJ-JPN" />
@@ -38767,7 +38767,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dolaleag">
-		<description>Dolucky no A.League Soccer (Jpn)</description>
+		<description>Dolucky no A.League Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-Z7" />
@@ -38782,7 +38782,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dolpuz94">
-		<description>Dolucky no Puzzle Tour '94 (Jpn)</description>
+		<description>Dolucky no Puzzle Tour '94 (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AZ8J-JPN" />
@@ -38797,7 +38797,7 @@ List of unclassified roms
 	</software>
 
 	<software name="donaldd">
-		<description>Donald Duck no Mahou no Boushi (Jpn)</description>
+		<description>Donald Duck no Mahou no Boushi (Japan)</description>
 		<year>1995</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-ADDJ-JPN" />
@@ -38812,7 +38812,7 @@ List of unclassified roms
 	</software>
 
 	<software name="mauimallj" cloneof="mauimall">
-		<description>Donald Duck no Maui Mallard (Jpn)</description>
+		<description>Donald Duck no Maui Mallard (Japan)</description>
 		<year>1996</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AZBJ-JPN" />
@@ -38857,7 +38857,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dkongc2ga" cloneof="dkongc2">
-		<description>Donkey Kong Country 2 - Diddy's Kong Quest (Ger)</description>
+		<description>Donkey Kong Country 2 - Diddy's Kong Quest (Germany)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -38888,7 +38888,7 @@ List of unclassified roms
 	</software>
 
 	<software name="doomj" cloneof="doom">
-		<description>Doom (Jpn)</description>
+		<description>Doom (Japan)</description>
 		<year>1996</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AD8J-JPN" />
@@ -38986,7 +38986,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dossungb">
-		<description>Dossun! Ganseki Battle (Jpn)</description>
+		<description>Dossun! Ganseki Battle (Japan)</description>
 		<year>1994</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-ADGJ-JPN" />
@@ -39013,7 +39013,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dokyuse2">
-		<description>Doukyuusei 2 (Jpn, NP)</description>
+		<description>Doukyuusei 2 (Japan, NP)</description>
 		<year>1997</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A88J-JPN" />
@@ -39030,7 +39030,7 @@ List of unclassified roms
 	</software>
 
 	<software name="downwrld">
-		<description>Down the World - Mervil's Ambition (Jpn)</description>
+		<description>Down the World - Mervil's Ambition (Japan)</description>
 		<year>1994</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-W9" />
@@ -39047,7 +39047,7 @@ List of unclassified roms
 	</software>
 
 	<software name="downwrldd" cloneof="downwrld">
-		<description>Down the World - Mervil's Ambition (Jpn, Rolling Demo)</description>
+		<description>Down the World - Mervil's Ambition (Japan, Rolling Demo)</description>
 		<year>1994</year>
 		<publisher>ASCII Entertainment</publisher>
 		<part name="cart" interface="snes_cart">
@@ -39074,7 +39074,7 @@ List of unclassified roms
 	</software>
 
 	<software name="downtown">
-		<description>Downtown Nekketsu Baseball Monogatari - Yakyuu de Shoubu Da! Kunio-kun (Jpn)</description>
+		<description>Downtown Nekketsu Baseball Monogatari - Yakyuu de Shoubu Da! Kunio-kun (Japan)</description>
 		<year>1993</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-NV" />
@@ -39091,7 +39091,7 @@ List of unclassified roms
 	</software>
 
 	<software name="drmario">
-		<description>Dr. Mario (Jpn, NP)</description>
+		<description>Dr. Mario (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BDMJ-JPN" />
@@ -39135,7 +39135,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzhypd">
-		<description>Dragon Ball Z - Hyper Dimension (Fra)</description>
+		<description>Dragon Ball Z - Hyper Dimension (France)</description>
 		<year>1996</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -39150,7 +39150,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzhypdj" cloneof="dbzhypd">
-		<description>Dragon Ball Z - Hyper Dimension (Jpn)</description>
+		<description>Dragon Ball Z - Hyper Dimension (Japan)</description>
 		<year>1996</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AZIJ-JPN" />
@@ -39168,7 +39168,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzbuto2">
-		<description>Dragon Ball Z - La Légende Saien (Fra)</description>
+		<description>Dragon Ball Z - La Légende Saien (France)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -39180,7 +39180,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzbutod">
-		<description>Dragon Ball Z - Super Butouden (Fra)</description>
+		<description>Dragon Ball Z - Super Butouden (France)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -39192,7 +39192,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzbutodjs" cloneof="dbzbutod">
-		<description>Dragon Ball Z - Super Butouden (Jpn, Sample)</description>
+		<description>Dragon Ball Z - Super Butouden (Japan, sample)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -39204,7 +39204,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzbuto2j" cloneof="dbzbuto2">
-		<description>Dragon Ball Z - Super Butouden 2 (Jpn, Rev. A)</description>
+		<description>Dragon Ball Z - Super Butouden 2 (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-EF" />
@@ -39220,7 +39220,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzkaku">
-		<description>Dragon Ball Z - Super Gokuu Den - Kakusei Hen (Jpn)</description>
+		<description>Dragon Ball Z - Super Gokuu Den - Kakusei Hen (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-A2ZJ-JPN" />
@@ -39247,7 +39247,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzsaiya">
-		<description>Dragon Ball Z - Super Saiya Densetsu (Jpn, Rev. A)</description>
+		<description>Dragon Ball Z - Super Saiya Densetsu (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-DB" />
@@ -39264,7 +39264,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dbzmenac">
-		<description>Dragon Ball Z - Ultime Menace (Fra)</description>
+		<description>Dragon Ball Z - Ultime Menace (France)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -39276,7 +39276,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dslayednp" cloneof="dslayed">
-		<description>Dragon Slayer - Eiyuu Densetsu (Jpn, Rev. A, NP)</description>
+		<description>Dragon Slayer - Eiyuu Densetsu (Japan, Rev. A, NP)</description>
 		<year>1992?</year>
 		<publisher>Epoch</publisher>
 		<part name="cart" interface="snes_cart">
@@ -39291,7 +39291,7 @@ List of unclassified roms
 
 	<software name="dslayed2">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Dragon Slayer - Eiyuu Densetsu II (Jpn)</description>
+		<description>Dragon Slayer - Eiyuu Densetsu II (Japan)</description>
 		<year>1993</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-A2" />
@@ -39323,7 +39323,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dearth">
-		<description>Dragon's Earth (Jpn)</description>
+		<description>Dragon's Earth (Japan)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-DG" />
@@ -39364,7 +39364,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dmagic" cloneof="dlair">
-		<description>Dragon's Magic (Jpn)</description>
+		<description>Dragon's Magic (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-DI" />
@@ -39393,7 +39393,7 @@ List of unclassified roms
 	</software>
 
 	<software name="drakkheng" cloneof="drakkhen">
-		<description>Drakkhen (Ger)</description>
+		<description>Drakkhen (Germany)</description>
 		<year>1991</year>
 		<publisher>Kemco</publisher>
 		<part name="cart" interface="snes_cart">
@@ -39407,7 +39407,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kigurumi">
-		<description>Yume Meikyuu - Kigurumi Daibouken (Jpn)</description>
+		<description>Yume Meikyuu - Kigurumi Daibouken (Japan)</description>
 		<year>1994</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-QX" />
@@ -39461,7 +39461,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dualorbs">
-		<description>Dual Orb - Seirei Tama Densetsu (Jpn)</description>
+		<description>Dual Orb - Seirei Tama Densetsu (Japan)</description>
 		<year>1993</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-DX" />
@@ -39478,7 +39478,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dualorb2">
-		<description>Dual Orb II (Jpn)</description>
+		<description>Dual Orb II (Japan)</description>
 		<year>1994</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-AD2J-JPN" />
@@ -39521,7 +39521,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dunquest">
-		<description>Dun Quest - Majin Fuuin no Densetsu (Jpn)</description>
+		<description>Dun Quest - Majin Fuuin no Densetsu (Japan)</description>
 		<year>1995</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-AD9J-JPN" />
@@ -39538,7 +39538,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dmasterj" cloneof="dmaster">
-		<description>Dungeon Master (Jpn, Rev. A)</description>
+		<description>Dungeon Master (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="serial" value="SHVC-V2" />
@@ -39559,7 +39559,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dmasterj1" cloneof="dmaster">
-		<description>Dungeon Master (Jpn)</description>
+		<description>Dungeon Master (Japan)</description>
 		<year>1991</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="serial" value="SHVC-V2" />
@@ -39599,7 +39599,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dynamlv">
-		<description>Dynamaite: The Las Vegas (Jpn)</description>
+		<description>Dynamaite: The Las Vegas (Japan)</description>
 		<year>1994</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-VQ" />
@@ -39654,7 +39654,7 @@ List of unclassified roms
 	</software>
 
 	<software name="earthlun">
-		<description>Earth Light - Luna Strike (Jpn)</description>
+		<description>Earth Light - Luna Strike (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AE5J-JPN" />
@@ -39687,7 +39687,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ejimj" cloneof="ejim">
-		<description>Earthworm Jim (Jpn)</description>
+		<description>Earthworm Jim (Japan)</description>
 		<year>1995</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-AEJJ-JPN" />
@@ -39714,7 +39714,7 @@ List of unclassified roms
 	</software>
 
 	<software name="edonokib">
-		<description>Edono Kiba (Jpn)</description>
+		<description>Edono Kiba (Japan)</description>
 		<year>1993</year>
 		<publisher>Micro World</publisher>
 		<info name="serial" value="SHVC-EK" />
@@ -39754,7 +39754,7 @@ List of unclassified roms
 	</software>
 
 	<software name="filerna">
-		<description>Eien no Filerna (Jpn)</description>
+		<description>Eien no Filerna (Japan)</description>
 		<year>1995</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="SHVC-AFLJ-JPN" />
@@ -39771,7 +39771,7 @@ List of unclassified roms
 	</software>
 
 	<software name="elfaria2">
-		<description>Elfaria II - The Quest of the Meld (Jpn)</description>
+		<description>Elfaria II - The Quest of the Meld (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AEFJ-JPN" />
@@ -39788,7 +39788,7 @@ List of unclassified roms
 	</software>
 
 	<software name="emeraldd">
-		<description>Emerald Dragon (Jpn)</description>
+		<description>Emerald Dragon (Japan)</description>
 		<year>1995</year>
 		<publisher>Media Works</publisher>
 		<info name="serial" value="SHVC-AMWJ-JPN" />
@@ -39805,7 +39805,7 @@ List of unclassified roms
 	</software>
 
 	<software name="emit1" supported="no"> <!-- unemulated additional hardware (Voice-Kun) -->
-		<description>Emit Vol. 1 - Toki no Maigo (Jpn)</description>
+		<description>Emit Vol. 1 - Toki no Maigo (Japan)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AEMJ-JPN" />
@@ -39822,7 +39822,7 @@ List of unclassified roms
 	</software>
 
 	<software name="emit2" supported="no"> <!-- unemulated additional hardware (Voice-Kun) -->
-		<description>Emit Vol. 2 - Inochigake no Tabi (Jpn)</description>
+		<description>Emit Vol. 2 - Inochigake no Tabi (Japan)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AEIJ-JPN" />
@@ -39839,7 +39839,7 @@ List of unclassified roms
 	</software>
 
 	<software name="emit3" supported="no"> <!-- unemulated additional hardware (Voice-Kun) -->
-		<description>Emit Vol. 3 - Watashi ni Sayonara o (Jpn)</description>
+		<description>Emit Vol. 3 - Watashi ni Sayonara o (Japan)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AETJ-JPN" />
@@ -39871,7 +39871,7 @@ List of unclassified roms
 	</software>
 
 	<software name="energybr">
-		<description>Energy Breaker (Jpn)</description>
+		<description>Energy Breaker (Japan)</description>
 		<year>1996</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-AZLJ-JPN" />
@@ -39919,7 +39919,7 @@ List of unclassified roms
 	</software>
 
 	<software name="cantona">
-		<description>Eric Cantona Football Challenge (Fra)</description>
+		<description>Eric Cantona Football Challenge (France)</description>
 		<year>1993</year>
 		<publisher>Elite Systems</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -39932,7 +39932,7 @@ List of unclassified roms
 	</software>
 
 	<software name="esparks">
-		<description>Esparks - Ijikuu kara no Raihousha (Jpn)</description>
+		<description>Esparks - Ijikuu kara no Raihousha (Japan)</description>
 		<year>1995</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-EP" />
@@ -40015,7 +40015,7 @@ List of unclassified roms
 	</software>
 
 	<software name="eurosens" cloneof="opeurope">
-		<description>Europa Sensen (Jpn)</description>
+		<description>Europa Sensen (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-YP" />
@@ -40089,7 +40089,7 @@ List of unclassified roms
 	</software>
 
 	<software name="eyebeholj" cloneof="eyebehol">
-		<description>Eye of the Beholder (Jpn)</description>
+		<description>Eye of the Beholder (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-IB" />
@@ -40122,7 +40122,7 @@ List of unclassified roms
 	</software>
 
 	<software name="f1gp">
-		<description>F-1 Grand Prix (Jpn)</description>
+		<description>F-1 Grand Prix (Japan)</description>
 		<year>1992</year>
 		<publisher>Video System</publisher>
 		<info name="serial" value="SHVC-FG" />
@@ -40139,7 +40139,7 @@ List of unclassified roms
 	</software>
 
 	<software name="f1gp2">
-		<description>F-1 Grand Prix - Part II (Jpn)</description>
+		<description>F-1 Grand Prix - Part II (Japan)</description>
 		<year>1993</year>
 		<publisher>Video System</publisher>
 		<info name="serial" value="SHVC-FV" />
@@ -40156,7 +40156,7 @@ List of unclassified roms
 	</software>
 
 	<software name="f1gp3">
-		<description>F-1 Grand Prix - Part III (Jpn)</description>
+		<description>F-1 Grand Prix - Part III (Japan)</description>
 		<year>1994</year>
 		<publisher>Video System</publisher>
 		<info name="serial" value="SHVC-VF" />
@@ -40272,7 +40272,7 @@ List of unclassified roms
 	</software>
 
 	<software name="famibunk">
-		<description>Famicom Bunko - Hajimari no Mori (Jpn, NP)</description>
+		<description>Famicom Bunko - Hajimari no Mori (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BTAJ-JPN" />
@@ -40289,7 +40289,7 @@ List of unclassified roms
 	</software>
 
 	<software name="famitc2a" cloneof="famitc2">
-		<description>Famicom Tantei Club Part II - Ushiro ni Tatsu Shoujo (Jpn, NP)</description>
+		<description>Famicom Tantei Club Part II - Ushiro ni Tatsu Shoujo (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BTCJ-JPN" />
@@ -40306,7 +40306,7 @@ List of unclassified roms
 	</software>
 
 	<software name="famitc2">
-		<description>Famicom Tantei Club Part II - Ushiro ni Tatsu Shoujo (Jpn, Rev. A, NP)</description>
+		<description>Famicom Tantei Club Part II - Ushiro ni Tatsu Shoujo (Japan, Rev. A, NP)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BTCJ-JPN" />
@@ -40348,7 +40348,7 @@ List of unclassified roms
 	</software>
 
 	<software name="farland">
-		<description>Farland Story (Jpn)</description>
+		<description>Farland Story (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AFSJ-JPN" />
@@ -40365,7 +40365,7 @@ List of unclassified roms
 	</software>
 
 	<software name="farland2">
-		<description>Farland Story 2 (Jpn)</description>
+		<description>Farland Story 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A2FJ-JPN" />
@@ -40395,7 +40395,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fedap" cloneof="feda">
-		<description>Feda - The Emblem of Justice (Jpn, prototype)</description>
+		<description>Feda - The Emblem of Justice (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Yanoman Games</publisher>
 		<part name="cart" interface="snes_cart">
@@ -40409,7 +40409,7 @@ List of unclassified roms
 	</software>
 
 	<software name="feda">
-		<description>Feda - The Emblem of Justice (Jpn)</description>
+		<description>Feda - The Emblem of Justice (Japan)</description>
 		<year>1994</year>
 		<publisher>Yanoman Games</publisher>
 		<info name="serial" value="SHVC-63" />
@@ -40463,7 +40463,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fifaj" cloneof="fifa">
-		<description>FIFA International Soccer (Jpn)</description>
+		<description>FIFA International Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-84" />
@@ -40522,7 +40522,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fghthistj" cloneof="fghthist">
-		<description>Fighter's History (Jpn)</description>
+		<description>Fighter's History (Japan)</description>
 		<year>1994</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-YH" />
@@ -40551,7 +40551,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fighthmk">
-		<description>Fighter's History - Mizoguchi Kikiippatsu!! (Jpn)</description>
+		<description>Fighter's History - Mizoguchi Kikiippatsu!! (Japan)</description>
 		<year>1995</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-AF3J-JPN" />
@@ -40567,7 +40567,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fightbb" cloneof="mlbpa">
-		<description>Fighting Baseball (Jpn)</description>
+		<description>Fighting Baseball (Japan)</description>
 		<year>1995</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-XH" />
@@ -40648,7 +40648,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ffightgj" cloneof="ffightg">
-		<description>Final Fight Guy (Jpn)</description>
+		<description>Final Fight Guy (Japan)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-FY" />
@@ -40677,7 +40677,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ffightt" cloneof="ffight3">
-		<description>Final Fight Tough (Jpn)</description>
+		<description>Final Fight Tough (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AFZJ-JPN" />
@@ -40692,7 +40692,7 @@ List of unclassified roms
 	</software>
 
 	<software name="finalko">
-		<description>Final Knockout (Jpn)</description>
+		<description>Final Knockout (Japan)</description>
 		<year>1993</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-LL" />
@@ -40707,7 +40707,7 @@ List of unclassified roms
 	</software>
 
 	<software name="finalstr">
-		<description>Final Stretch (Jpn)</description>
+		<description>Final Stretch (Japan)</description>
 		<year>1993</year>
 		<publisher>LOZC</publisher>
 		<info name="serial" value="SHVC-OP" />
@@ -40728,7 +40728,7 @@ List of unclassified roms
 	</software>
 
 	<software name="finalset">
-		<description>Finalset (Jpn)</description>
+		<description>Finalset (Japan)</description>
 		<year>1993</year>
 		<publisher>Forum</publisher>
 		<info name="serial" value="SHVC-OF" />
@@ -40744,7 +40744,7 @@ List of unclassified roms
 
 	<software name="firembmn">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Fire Emblem - Monshou no Nazo (Jpn, Rev. A)</description>
+		<description>Fire Emblem - Monshou no Nazo (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-EM" /> <!-- NP cart: SHVC-MMSA-JPN-1 -->
@@ -40778,7 +40778,7 @@ List of unclassified roms
 	</software>
 
 	<software name="firembthnp" cloneof="firembth">
-		<description>Fire Emblem - Thracia 776 (Jpn, NP)</description>
+		<description>Fire Emblem - Thracia 776 (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BFRJ-JPN" />
@@ -40795,7 +40795,7 @@ List of unclassified roms
 	</software>
 
 	<software name="firembth">
-		<description>Fire Emblem - Thracia 776 (Jpn, Rev. A, NP)</description>
+		<description>Fire Emblem - Thracia 776 (Japan, Rev. A, NP)</description>
 		<year>2000</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BFRJ-JPN" />
@@ -40812,7 +40812,7 @@ List of unclassified roms
 	</software>
 
 	<software name="firembtha" cloneof="firembth">
-		<description>Fire Emblem - Thracia 776 (Jpn)</description>
+		<description>Fire Emblem - Thracia 776 (Japan)</description>
 		<year>2000</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BFRJ-JPN" />
@@ -40829,7 +40829,7 @@ List of unclassified roms
 	</software>
 
 	<software name="firefght" cloneof="ignition">
-		<description>Fire Fighting (Jpn)</description>
+		<description>Fire Fighting (Japan)</description>
 		<year>1994</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-AIFJ-JPN" />
@@ -40893,7 +40893,7 @@ List of unclassified roms
 	</software>
 
 	<software name="firemenj" cloneof="firemen">
-		<description>The Firemen (Jpn)</description>
+		<description>The Firemen (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AFMJ-JPN" />
@@ -40921,7 +40921,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fqueen">
-		<description>First Queen - Ornic Senki (Jpn)</description>
+		<description>First Queen - Ornic Senki (Japan)</description>
 		<year>1994</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-OQ" />
@@ -40938,7 +40938,7 @@ List of unclassified roms
 	</software>
 
 	<software name="firstsamj" cloneof="firstsam">
-		<description>First Samurai (Jpn)</description>
+		<description>First Samurai (Japan)</description>
 		<year>1993</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-FK" />
@@ -40953,7 +40953,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fishkosn">
-		<description>Fishing Koushien (Jpn)</description>
+		<description>Fishing Koushien (Japan)</description>
 		<year>1996</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="SHVC-AQJJ (KIS-6)" />
@@ -41019,7 +41019,7 @@ List of unclassified roms
 	</software>
 
 	<software name="flintsmj" cloneof="flintsm">
-		<description>The Flintstones - The Treasure of Sierra Madrock (Jpn)</description>
+		<description>The Flintstones - The Treasure of Sierra Madrock (Japan)</description>
 		<year>1994</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-9F" />
@@ -41034,7 +41034,7 @@ List of unclassified roms
 	</software>
 
 	<software name="flyhero">
-		<description>Flying Hero - Bugyuru no Daibouken (Jpn)</description>
+		<description>Flying Hero - Bugyuru no Daibouken (Japan)</description>
 		<year>1992</year>
 		<publisher>Sofel</publisher>
 		<info name="serial" value="SHVC-B9" />
@@ -41075,7 +41075,7 @@ List of unclassified roms
 	</software>
 
 	<software name="foremanj" cloneof="foreman">
-		<description>Foreman For Real (Jpn)</description>
+		<description>Foreman For Real (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AFEJ-JPN" />
@@ -41105,7 +41105,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fortuneq">
-		<description>Fortune Quest - Dice o Korogase (Jpn)</description>
+		<description>Fortune Quest - Dice o Korogase (Japan)</description>
 		<year>1994</year>
 		<publisher>Zamuse</publisher>
 		<info name="serial" value="SHVC-FQ" />
@@ -41136,7 +41136,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bighurtj" cloneof="bighurt">
-		<description>Frank Thomas Big Hurt Baseball (Jpn)</description>
+		<description>Frank Thomas Big Hurt Baseball (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AFKJ-JPN" />
@@ -41218,7 +41218,7 @@ List of unclassified roms
 	</software>
 
 	<software name="slamdksl">
-		<description>From TV Animation Slam Dunk - Dream Team - Shuueisha Limited (Jpn)</description>
+		<description>From TV Animation Slam Dunk - Dream Team - Shuueisha Limited (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="release" value="19940720" />
@@ -41231,7 +41231,7 @@ List of unclassified roms
 	</software>
 
 	<software name="slamdksd">
-		<description>From TV Animation Slam Dunk - SD Heat Up!! (Jpn)</description>
+		<description>From TV Animation Slam Dunk - SD Heat Up!! (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AIHJ-JPN" />
@@ -41246,7 +41246,7 @@ List of unclassified roms
 	</software>
 
 	<software name="frontmis">
-		<description>Front Mission (Jpn, Rev. A)</description>
+		<description>Front Mission (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AGCJ-JPN" />
@@ -41263,7 +41263,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fullpowr" cloneof="fullthrt">
-		<description>Full Power (Jpn)</description>
+		<description>Full Power (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-AFTJ-JPN" />
@@ -41340,7 +41340,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hybwrest">
-		<description>Funaki Masakatsu Hybrid Wrestler - Tougi Denshou (Jpn)</description>
+		<description>Funaki Masakatsu Hybrid Wrestler - Tougi Denshou (Japan)</description>
 		<year>1994</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-ZR" />
@@ -41357,7 +41357,7 @@ List of unclassified roms
 	</software>
 
 	<software name="funetaro">
-		<description>Fune Tarou (Jpn)</description>
+		<description>Fune Tarou (Japan)</description>
 		<year>1997</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-A7EJ-JPN" />
@@ -41374,7 +41374,7 @@ List of unclassified roms
 	</software>
 
 	<software name="furutats">
-		<description>Furuta Atsuya no Simulation Pro Yakyuu 2 (Jpn)</description>
+		<description>Furuta Atsuya no Simulation Pro Yakyuu 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-AY9J-JPN" />
@@ -41391,7 +41391,7 @@ List of unclassified roms
 	</software>
 
 	<software name="fushidn2">
-		<description>Fushigi no Dungeon 2 - Fuurai no Shiren (Jpn, Rev. A, NP)</description>
+		<description>Fushigi no Dungeon 2 - Fuurai no Shiren (Japan, Rev. A, NP)</description>
 		<year>1995?</year>
 		<publisher>Chunsoft?</publisher>
 		<part name="cart" interface="snes_cart">
@@ -41405,7 +41405,7 @@ List of unclassified roms
 	</software>
 
 	<software name="god">
-		<description>G.O.D - Mezame yo to Yobu Koe ga Kikoe (Jpn)</description>
+		<description>G.O.D - Mezame yo to Yobu Koe ga Kikoe (Japan)</description>
 		<year>1996</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AGDJ-JPN" />
@@ -41422,7 +41422,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gaiasavr">
-		<description>Gaia Saver - Hero Saidai no Sakusen (Jpn)</description>
+		<description>Gaia Saver - Hero Saidai no Sakusen (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-G9" />
@@ -41440,7 +41440,7 @@ List of unclassified roms
 	</software>
 
 	<software name="galxyrob">
-		<description>Galaxy Robo (Jpn)</description>
+		<description>Galaxy Robo (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SJVC-XY" />
@@ -41457,7 +41457,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gambler2">
-		<description>Gambler Jikochuushinha 2 - Dorapon Quest (Jpn)</description>
+		<description>Gambler Jikochuushinha 2 - Dorapon Quest (Japan)</description>
 		<year>1994</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-8G" />
@@ -41472,7 +41472,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gambling">
-		<description>Gambling Hourouki (Jpn)</description>
+		<description>Gambling Hourouki (Japan)</description>
 		<year>1996</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-A7BJ-JPN" />
@@ -41487,7 +41487,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gametats">
-		<description>Game no Tatsujin (Jpn)</description>
+		<description>Game no Tatsujin (Japan)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-AGEJ-JPN" />
@@ -41502,7 +41502,7 @@ List of unclassified roms
 	</software>
 
 	<software name="shanghai">
-		<description>Game no Tetsujin - The Shanghai (Jpn)</description>
+		<description>Game no Tetsujin - The Shanghai (Japan)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-A2GJ-JPN" />
@@ -41517,7 +41517,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gamera">
-		<description>Gamera - Gyaos Gekimetsu Sakusen (Jpn)</description>
+		<description>Gamera - Gyaos Gekimetsu Sakusen (Japan)</description>
 		<year>1995</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AGIJ-JPN" />
@@ -41534,7 +41534,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ggoemon3a" cloneof="ggoemon3">
-		<description>Ganbare Goemon 3 - Shishi Juurokubee no Karakuri Manjigatame (Jpn)</description>
+		<description>Ganbare Goemon 3 - Shishi Juurokubee no Karakuri Manjigatame (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-2U" />
@@ -41552,7 +41552,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ggoemon3">
-		<description>Ganbare Goemon 3 - Shishi Juurokubee no Karakuri Manjigatame (Jpn, Rev. B)</description>
+		<description>Ganbare Goemon 3 - Shishi Juurokubee no Karakuri Manjigatame (Japan, Rev. B)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-2U" />
@@ -41579,7 +41579,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ggoemkir">
-		<description>Ganbare Goemon Kirakira Douchuu - Boku ga Dancer ni Natta Wake (Jpn, Rev. B, NP)</description>
+		<description>Ganbare Goemon Kirakira Douchuu - Boku ga Dancer ni Natta Wake (Japan, Rev. B, NP)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-A4GJ-JPN" />
@@ -41597,7 +41597,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ggoemkira" cloneof="ggoemkir">
-		<description>Ganbare Goemon Kirakira Douchuu - Boku ga Dancer ni Natta Wake (Jpn, Rev. A)</description>
+		<description>Ganbare Goemon Kirakira Douchuu - Boku ga Dancer ni Natta Wake (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-A4GJ-JPN" />
@@ -41615,7 +41615,7 @@ List of unclassified roms
 	</software>
 
 	<software name="daigensn">
-		<description>Ganbare! Daiku no Gen-san (Jpn)</description>
+		<description>Ganbare! Daiku no Gen-san (Japan)</description>
 		<year>1993</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="SHVC-EZ" />
@@ -41631,7 +41631,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gangan">
-		<description>Gangan Gan-chan (Jpn)</description>
+		<description>Gangan Gan-chan (Japan)</description>
 		<year>1995</year>
 		<publisher>Magifact</publisher>
 		<info name="serial" value="SHVC-AGQJ-JPN" />
@@ -41646,7 +41646,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ganpuru">
-		<description>Ganpuru - Gunman's Proof (Jpn)</description>
+		<description>Ganpuru - Gunman's Proof (Japan)</description>
 		<year>1997</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AXAJ-JPN" />
@@ -41663,7 +41663,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ganpurup" cloneof="ganpuru">
-		<description>Ganpuru - Gunman's Proof (Jpn, prototype)</description>
+		<description>Ganpuru - Gunman's Proof (Japan, prototype)</description>
 		<year>1997</year>
 		<publisher>ASCII Entertainment</publisher>
 		<part name="cart" interface="snes_cart">
@@ -41677,7 +41677,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gansopsl">
-		<description>Ganso Pachi-Slot Nihonichi (Jpn)</description>
+		<description>Ganso Pachi-Slot Nihonichi (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-O4" />
@@ -41692,7 +41692,7 @@ List of unclassified roms
 	</software>
 
 	<software name="garou2" cloneof="fatfury2">
-		<description>Garou Densetsu 2 - Aratanaru Tatakai (Jpn, Rev. A)</description>
+		<description>Garou Densetsu 2 - Aratanaru Tatakai (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-DJ" />
@@ -41707,7 +41707,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gdleen">
-		<description>Gdleen (Jpn, Rev. A)</description>
+		<description>Gdleen (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-GD" />
@@ -41724,7 +41724,7 @@ List of unclassified roms
 	</software>
 
 	<software name="batlmobl">
-		<description>Gekitotsu Dangan Jidousha Kessen - Battle Mobile (Jpn)</description>
+		<description>Gekitotsu Dangan Jidousha Kessen - Battle Mobile (Japan)</description>
 		<year>1993</year>
 		<publisher>System Sacom</publisher>
 		<info name="serial" value="SHVC-KV" />
@@ -41739,7 +41739,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gekitopw">
-		<description>Gekitou Burning Pro Wrestling (Jpn)</description>
+		<description>Gekitou Burning Pro Wrestling (Japan)</description>
 		<year>1995</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-AWNJ-JPN" />
@@ -41786,7 +41786,7 @@ List of unclassified roms
 	</software>
 
 	<software name="genjryod">
-		<description>Genjuu Ryodan (Jpn, NP)</description>
+		<description>Genjuu Ryodan (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>Axela</publisher>
 		<info name="serial" value="SHVC-BGJJ-JPN" />
@@ -41803,7 +41803,7 @@ List of unclassified roms
 	</software>
 
 	<software name="genocid2p" cloneof="genocid2">
-		<description>Genocide 2 (Jpn, prototype)</description>
+		<description>Genocide 2 (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Kemco</publisher>
 		<part name="cart" interface="snes_cart">
@@ -41865,7 +41865,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gethole">
-		<description>Get in the Hole (Jpn)</description>
+		<description>Get in the Hole (Japan)</description>
 		<year>1995</year>
 		<publisher>Good House</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
@@ -41880,7 +41880,7 @@ List of unclassified roms
 	</software>
 
 	<software name="getsumen">
-		<description>Getsumen no Anubis (Jpn)</description>
+		<description>Getsumen no Anubis (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-ALEJ-JPN" />
@@ -41909,7 +41909,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ghoulptrj" cloneof="ghoulptr">
-		<description>Ghoul Patrol (Jpn)</description>
+		<description>Ghoul Patrol (Japan)</description>
 		<year>1995</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-AGJJ-JPN" />
@@ -41937,7 +41937,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gindamap">
-		<description>Gindama Oyakata no Pachinko Hisshouhou (Jpn, Rev. A)</description>
+		<description>Gindama Oyakata no Pachinko Hisshouhou (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AJPJ-JPN" />
@@ -41954,7 +41954,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gingeiyu">
-		<description>Ginga Eiyuu Densetsu (Jpn)</description>
+		<description>Ginga Eiyuu Densetsu (Japan)</description>
 		<year>1992</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="SHVC-GE" />
@@ -41971,7 +41971,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gingseng">
-		<description>Ginga Sengoku Gunyuuden Rai (Jpn)</description>
+		<description>Ginga Sengoku Gunyuuden Rai (Japan)</description>
 		<year>1996</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-AQPJ-JPN" />
@@ -41988,7 +41988,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gogoack">
-		<description>Go Go Ackman (Jpn)</description>
+		<description>Go Go Ackman (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ACKJ-JPN" />
@@ -42004,7 +42004,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gogododg">
-		<description>Go! Go! Dodge League (Jpn, Rev. A)</description>
+		<description>Go! Go! Dodge League (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-R5" />
@@ -42020,7 +42020,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gogododg1" cloneof="gogododg">
-		<description>Go! Go! Dodge League (Jpn)</description>
+		<description>Go! Go! Dodge League (Japan)</description>
 		<year>1993</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-R5" />
@@ -42076,7 +42076,7 @@ List of unclassified roms
 	</software>
 
 	<software name="godzilla">
-		<description>Godzilla - Kaijuu Daikessen (Jpn)</description>
+		<description>Godzilla - Kaijuu Daikessen (Japan)</description>
 		<year>1994</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="SHVC-AG2J-JPN" />
@@ -42091,7 +42091,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gokinjob">
-		<description>Gokinjo Boukentai (Jpn)</description>
+		<description>Gokinjo Boukentai (Japan)</description>
 		<year>1996</year>
 		<publisher>Pioneer</publisher>
 		<info name="serial" value="SHVC-A3LJ-JPN" />
@@ -42108,7 +42108,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gokuparop" cloneof="gokuparo">
-		<description>Gokujou Parodius (Jpn, prototype)</description>
+		<description>Gokujou Parodius (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
@@ -42121,7 +42121,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gokuparos" cloneof="gokuparo">
-		<description>Gokujou Parodius (Jpn, Sample)</description>
+		<description>Gokujou Parodius (Japan, sample)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
@@ -42134,7 +42134,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gon">
-		<description>Gon (Jpn)</description>
+		<description>Gon (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AHOJ-JPN" />
@@ -42161,7 +42161,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gooftropf" cloneof="gooftrop">
-		<description>Disney's Goof Troop (Fra)</description>
+		<description>Disney's Goof Troop (France)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<part name="cart" interface="snes_cart">
@@ -42173,7 +42173,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gooftropg" cloneof="gooftrop">
-		<description>Disney's Goof Troop (Ger)</description>
+		<description>Disney's Goof Troop (Germany)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<part name="cart" interface="snes_cart">
@@ -42185,7 +42185,7 @@ List of unclassified roms
 	</software>
 
 	<software name="goofymax" cloneof="gooftrop">
-		<description>Disney's Goof Troop - Goofy to Max - Kaizokujima no Daibouken (Jpn)</description>
+		<description>Disney's Goof Troop - Goofy to Max - Kaizokujima no Daibouken (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-G6" />
@@ -42200,7 +42200,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gourmet">
-		<description>Gourmet Sentai Barayarou (Jpn)</description>
+		<description>Gourmet Sentai Barayarou (Japan)</description>
 		<year>1995</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AV6J-JPN" />
@@ -42228,7 +42228,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gousouji" cloneof="musya">
-		<description>Gousou Jinrai Densetsu - Musha (Jpn)</description>
+		<description>Gousou Jinrai Densetsu - Musha (Japan)</description>
 		<year>1992</year>
 		<publisher>Datam Polystar</publisher>
 		<info name="serial" value="SHVC-MY" />
@@ -42284,7 +42284,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gp1rs" cloneof="gp1part2">
-		<description>GP-1 RS - Rapid Stream (Jpn)</description>
+		<description>GP-1 RS - Rapid Stream (Japan)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-AGRJ-JPN" />
@@ -42314,7 +42314,7 @@ List of unclassified roms
 	</software>
 
 	<software name="granhista" cloneof="granhist">
-		<description>Granhistoria - Genshi Sekaiki (Jpn)</description>
+		<description>Granhistoria - Genshi Sekaiki (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AIRJ-JPN" />
@@ -42331,7 +42331,7 @@ List of unclassified roms
 	</software>
 
 	<software name="granhists" cloneof="granhist">
-		<description>Granhistoria - Genshi Sekaiki (Jpn, Sample)</description>
+		<description>Granhistoria - Genshi Sekaiki (Japan, sample)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<part name="cart" interface="snes_cart">
@@ -42345,7 +42345,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gbattlg2">
-		<description>The Great Battle Gaiden 2 - Matsuri Da Wasshoi (Jpn)</description>
+		<description>The Great Battle Gaiden 2 - Matsuri Da Wasshoi (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-K8" />
@@ -42361,7 +42361,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gbattle4s" cloneof="gbattle4">
-		<description>The Great Battle IV (Jpn, Sample)</description>
+		<description>The Great Battle IV (Japan, sample)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
@@ -42374,7 +42374,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gbattle5">
-		<description>The Great Battle V (Jpn)</description>
+		<description>The Great Battle V (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AG5J-JPN" />
@@ -42427,7 +42427,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gsmikami">
-		<description>GS Mikami - Joreishi wa Nice Body (Jpn)</description>
+		<description>GS Mikami - Joreishi wa Nice Body (Japan)</description>
 		<year>1993</year>
 		<publisher>Banalex</publisher>
 		<info name="serial" value="SHVC-IR" />
@@ -42442,7 +42442,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gtracing">
-		<description>GT Racing (Jpn)</description>
+		<description>GT Racing (Japan)</description>
 		<year>1996</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AIKJ-JPN" />
@@ -42485,7 +42485,7 @@ List of unclassified roms
 	</software>
 
 	<software name="haganejp" cloneof="hagane">
-		<description>Hagane (Jpn, prototype)</description>
+		<description>Hagane (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<part name="cart" interface="snes_cart">
@@ -42497,7 +42497,7 @@ List of unclassified roms
 	</software>
 
 	<software name="haganej" cloneof="hagane">
-		<description>Hagane (Jpn)</description>
+		<description>Hagane (Japan)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AHGJ-JPN" />
@@ -42527,7 +42527,7 @@ List of unclassified roms
 	</software>
 
 	<software name="haiseimj">
-		<description>Haisei Mahjong - Ryouga (Jpn)</description>
+		<description>Haisei Mahjong - Ryouga (Japan)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AMJJ-JPN" />
@@ -42544,7 +42544,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hakpro93">
-		<description>Hakunetsu Pro Yakyuu '93 - Ganba League (Jpn)</description>
+		<description>Hakunetsu Pro Yakyuu '93 - Ganba League (Japan)</description>
 		<year>1992</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-GV (ESPG47)" />
@@ -42561,7 +42561,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hakpro94">
-		<description>Hakunetsu Pro Yakyuu '94 - Ganba League 3 (Jpn)</description>
+		<description>Hakunetsu Pro Yakyuu '94 - Ganba League 3 (Japan)</description>
 		<year>1993</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-E3 (ESPG50)" />
@@ -42578,7 +42578,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hakprogla" cloneof="extrainn">
-		<description>Hakunetsu Pro Yakyuu - Ganba League (Jpn)</description>
+		<description>Hakunetsu Pro Yakyuu - Ganba League (Japan)</description>
 		<year>1991</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-GL (ESPG38)" />
@@ -42607,7 +42607,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hameln">
-		<description>Hameln no Violin Hiki (Jpn)</description>
+		<description>Hameln no Violin Hiki (Japan)</description>
 		<year>1995</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AVNJ-JPN" />
@@ -42636,7 +42636,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hanakeij">
-		<description>Hana no Keiji - Kumo no Kanata ni (Jpn)</description>
+		<description>Hana no Keiji - Kumo no Kanata ni (Japan)</description>
 		<year>1994</year>
 		<publisher>Yojigen</publisher>
 		<info name="serial" value="SHVC-AY4J-JPN" />
@@ -42651,7 +42651,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hanafuda">
-		<description>Hanafuda Ou (Jpn)</description>
+		<description>Hanafuda Ou (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-IJ" />
@@ -42684,7 +42684,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hanseizj">
-		<description>Hansei Zaru Jiro-kun no Daibouken (Jpn)</description>
+		<description>Hansei Zaru Jiro-kun no Daibouken (Japan)</description>
 		<year>1991</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="SHVC-HJ" />
@@ -42699,7 +42699,7 @@ List of unclassified roms
 	</software>
 
 	<software name="haoutryu1" cloneof="haoutryu">
-		<description>Haou Taikei Ryuu Knight - Lord of Paladin (Jpn)</description>
+		<description>Haou Taikei Ryuu Knight - Lord of Paladin (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-UR" />
@@ -42716,7 +42716,7 @@ List of unclassified roms
 	</software>
 
 	<software name="harapeko" cloneof="hungryd">
-		<description>Harapeko Bakka (Jpn)</description>
+		<description>Harapeko Bakka (Japan)</description>
 		<year>1994</year>
 		<publisher>Magical</publisher>
 		<info name="serial" value="SHVC-ABKJ-JPN" />
@@ -42795,7 +42795,7 @@ List of unclassified roms
 	</software>
 
 	<software name="harvmoong" cloneof="harvmoon">
-		<description>Harvest Moon (Ger)</description>
+		<description>Harvest Moon (Germany)</description>
 		<year>1997</year>
 		<publisher>Natsume</publisher>
 		<part name="cart" interface="snes_cart">
@@ -42809,7 +42809,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hashhebe">
-		<description>Hashire Hebereke (Jpn)</description>
+		<description>Hashire Hebereke (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-AHHJ-JPN" />
@@ -42826,7 +42826,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hatayama">
-		<description>Hatayama Hatch no Pro Yakyuu News! - Jitsumei Ban (Jpn)</description>
+		<description>Hatayama Hatch no Pro Yakyuu News! - Jitsumei Ban (Japan)</description>
 		<year>1993</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-EB" />
@@ -42857,7 +42857,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hebereke">
-		<description>Hebereke no Oishii Puzzle wa Irimasenka (Jpn)</description>
+		<description>Hebereke no Oishii Puzzle wa Irimasenka (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-O3" />
@@ -42872,7 +42872,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hebepopnj" cloneof="hebepopn">
-		<description>Hebereke no Popoon (Jpn)</description>
+		<description>Hebereke no Popoon (Japan)</description>
 		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-HU" />
@@ -42913,7 +42913,7 @@ List of unclassified roms
 	</software>
 
 	<software name="heianfuu">
-		<description>Heian Fuuunden (Jpn)</description>
+		<description>Heian Fuuunden (Japan)</description>
 		<year>1995</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AKHJ " />
@@ -42930,7 +42930,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gunjnsho">
-		<description>Heisei Gunjin Shougi (Jpn)</description>
+		<description>Heisei Gunjin Shougi (Japan)</description>
 		<year>1996</year>
 		<publisher>Carrozzeria Japan</publisher>
 		<info name="serial" value="SHVC-AG7J-JPN" />
@@ -42945,7 +42945,7 @@ List of unclassified roms
 	</software>
 
 	<software name="popsmash">
-		<description>Heisei Inu Monogatari Bow - Pop'n Smash!! (Jpn)</description>
+		<description>Heisei Inu Monogatari Bow - Pop'n Smash!! (Japan)</description>
 		<year>1994</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-QQ" />
@@ -42960,7 +42960,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hsonigak">
-		<description>Heisei Shin Onigashima - Kouhen (Jpn)</description>
+		<description>Heisei Shin Onigashima - Kouhen (Japan)</description>
 		<year>1997</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-AO5J-JPN" />
@@ -42977,7 +42977,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hsonigaz">
-		<description>Heisei Shin Onigashima - Zenpen (Jpn)</description>
+		<description>Heisei Shin Onigashima - Zenpen (Japan)</description>
 		<year>1997</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-AO4J-JPN" />
@@ -42994,7 +42994,7 @@ List of unclassified roms
 	</software>
 
 	<software name="heiwapw">
-		<description>Heiwa Pachinko World (Jpn)</description>
+		<description>Heiwa Pachinko World (Japan)</description>
 		<year>1995</year>
 		<publisher>Shouei System</publisher>
 		<info name="serial" value="SHVC-AHWJ-JPN" />
@@ -43011,7 +43011,7 @@ List of unclassified roms
 	</software>
 
 	<software name="heiwapw2">
-		<description>Heiwa Pachinko World 2 (Jpn)</description>
+		<description>Heiwa Pachinko World 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Shouei System</publisher>
 		<info name="serial" value="SHVC-AWTJ-JPN" />
@@ -43028,7 +43028,7 @@ List of unclassified roms
 	</software>
 
 	<software name="heiwapw3">
-		<description>Heiwa Pachinko World 3 (Jpn)</description>
+		<description>Heiwa Pachinko World 3 (Japan)</description>
 		<year>1996</year>
 		<publisher>Shouei System</publisher>
 		<info name="serial" value="SHVC-A3WJ-JPN" />
@@ -43045,7 +43045,7 @@ List of unclassified roms
 	</software>
 
 	<software name="parlmin8">
-		<description>Heiwa Parlor! Mini 8 - Pachinko Jikki Simulation Game (Jpn)</description>
+		<description>Heiwa Parlor! Mini 8 - Pachinko Jikki Simulation Game (Japan)</description>
 		<year>1998</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQUJ-JPN" />
@@ -43060,7 +43060,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hellopac" cloneof="pacman2">
-		<description>Hello! Pac-Man (Jpn)</description>
+		<description>Hello! Pac-Man (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-PN" />
@@ -43075,7 +43075,7 @@ List of unclassified roms
 	</software>
 
 	<software name="herakl3">
-		<description>Herakles no Eikou III - Kamigami no Chinmoku (Jpn)</description>
+		<description>Herakles no Eikou III - Kamigami no Chinmoku (Japan)</description>
 		<year>1992</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-HE" />
@@ -43092,7 +43092,7 @@ List of unclassified roms
 	</software>
 
 	<software name="herakl4">
-		<description>Herakles no Eikou IV - Kamigami kara no Okurimono (Jpn)</description>
+		<description>Herakles no Eikou IV - Kamigami kara no Okurimono (Japan)</description>
 		<year>1994</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-4E" />
@@ -43109,7 +43109,7 @@ List of unclassified roms
 	</software>
 
 	<software name="herosenk">
-		<description>Hero Senki - Project Olympus (Jpn)</description>
+		<description>Hero Senki - Project Olympus (Japan)</description>
 		<year>1992</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-HS" />
@@ -43126,7 +43126,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hinoouji">
-		<description>Hi no Ouji - Yamato Takeru (Jpn)</description>
+		<description>Hi no Ouji - Yamato Takeru (Japan)</description>
 		<year>1995</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="SHVC-AYTJ-JPN" />
@@ -43143,7 +43143,7 @@ List of unclassified roms
 	</software>
 
 	<software name="sproyak">
-		<description>Higashio Osamu Kanshuu Super Pro Yakyuu Stadium (Jpn)</description>
+		<description>Higashio Osamu Kanshuu Super Pro Yakyuu Stadium (Japan)</description>
 		<year>1993</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="SHVC-PK" />
@@ -43160,7 +43160,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hiouden">
-		<description>Hiouden - Mamono-tachi to no Chikai (Jpn)</description>
+		<description>Hiouden - Mamono-tachi to no Chikai (Japan)</description>
 		<year>1994</year>
 		<publisher>Wolf Team</publisher>
 		<info name="serial" value="SHVC-HR" />
@@ -43177,7 +43177,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hisspac2">
-		<description>Hissatsu Pachinko Collection 2 (Jpn)</description>
+		<description>Hissatsu Pachinko Collection 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-A2HJ-JPN" />
@@ -43195,7 +43195,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hisspac3">
-		<description>Hissatsu Pachinko Collection 3 (Jpn)</description>
+		<description>Hissatsu Pachinko Collection 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-A3HJ-JPN" />
@@ -43213,7 +43213,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hisspac4">
-		<description>Hissatsu Pachinko Collection 4 (Jpn)</description>
+		<description>Hissatsu Pachinko Collection 4 (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-AH4J-JPN" />
@@ -43230,7 +43230,7 @@ List of unclassified roms
 	</software>
 
 	<software name="his777f2">
-		<description>Hisshou 777 Fighter II - Pachi-Slot Maruhi Jouhou (Jpn)</description>
+		<description>Hisshou 777 Fighter II - Pachi-Slot Maruhi Jouhou (Japan)</description>
 		<year>1994</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-72" />
@@ -43245,7 +43245,7 @@ List of unclassified roms
 	</software>
 
 	<software name="his777f3">
-		<description>Hisshou 777 Fighter III - Kokuryuu Ou no Fukkatsu (Jpn)</description>
+		<description>Hisshou 777 Fighter III - Kokuryuu Ou no Fukkatsu (Japan)</description>
 		<year>1995</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-A73J-JPN" />
@@ -43260,7 +43260,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hispslot">
-		<description>Hisshou Pachi-Slot Fun (Jpn)</description>
+		<description>Hisshou Pachi-Slot Fun (Japan)</description>
 		<year>1994</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-APNJ-JPN" />
@@ -43290,7 +43290,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hokuto5">
-		<description>Hokuto no Ken 5 - Tenma Ryuuseiden Ai Zetsu Shou (Jpn)</description>
+		<description>Hokuto no Ken 5 - Tenma Ryuuseiden Ai Zetsu Shou (Japan)</description>
 		<year>1992</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="SHVC-K5" />
@@ -43307,7 +43307,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hokuto6">
-		<description>Hokuto no Ken 6 - Gekitou Denshouken Haou e no Michi (Jpn)</description>
+		<description>Hokuto no Ken 6 - Gekitou Denshouken Haou e no Michi (Japan)</description>
 		<year>1992</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="SHVC-K6" />
@@ -43322,7 +43322,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hokuto7">
-		<description>Hokuto no Ken 7 - Seiken Retsuden Denshousha e no Michi (Jpn)</description>
+		<description>Hokuto no Ken 7 - Seiken Retsuden Denshousha e no Michi (Japan)</description>
 		<year>1993</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="SHVC-K7" />
@@ -43337,7 +43337,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hstriker" cloneof="fstriker">
-		<description>Holy Striker (Jpn)</description>
+		<description>Holy Striker (Japan)</description>
 		<year>1993</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-AI" />
@@ -43352,7 +43352,7 @@ List of unclassified roms
 	</software>
 
 	<software name="holyumb">
-		<description>Holy Umbrella - Dondera no Mubou!! (Jpn)</description>
+		<description>Holy Umbrella - Dondera no Mubou!! (Japan)</description>
 		<year>1995</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-ADQJ-JPN" />
@@ -43381,7 +43381,7 @@ List of unclassified roms
 	</software>
 
 	<software name="homeaj" cloneof="homea">
-		<description>Home Alone (Jpn)</description>
+		<description>Home Alone (Japan)</description>
 		<year>1992</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-HA" />
@@ -43434,7 +43434,7 @@ List of unclassified roms
 	</software>
 
 	<software name="honktman">
-		<description>Honkaku Mahjong - Tetsuman (Jpn)</description>
+		<description>Honkaku Mahjong - Tetsuman (Japan)</description>
 		<year>1993</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-OM" />
@@ -43449,7 +43449,7 @@ List of unclassified roms
 	</software>
 
 	<software name="honkasho">
-		<description>Honkaku Shougi - Fuuunji Ryuuou (Jpn)</description>
+		<description>Honkaku Shougi - Fuuunji Ryuuou (Japan)</description>
 		<year>1994</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AV3J-JPN" />
@@ -43466,7 +43466,7 @@ List of unclassified roms
 	</software>
 
 	<software name="honkaigo">
-		<description>Honkakuha Igo - Gosei (Jpn)</description>
+		<description>Honkakuha Igo - Gosei (Japan)</description>
 		<year>1994</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-AKWJ-JPN" />
@@ -43483,7 +43483,7 @@ List of unclassified roms
 	</software>
 
 	<software name="honkehan">
-		<description>Honke Hanafuda (Jpn)</description>
+		<description>Honke Hanafuda (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-87" />
@@ -43498,7 +43498,7 @@ List of unclassified roms
 	</software>
 
 	<software name="honkefev">
-		<description>Honke Sankyo Fever - Jikki Simulation (Jpn)</description>
+		<description>Honke Sankyo Fever - Jikki Simulation (Japan)</description>
 		<year>1995</year>
 		<publisher>Den'Z</publisher>
 		<info name="serial" value="SHVC-AFPJ-JPN" />
@@ -43514,7 +43514,7 @@ List of unclassified roms
 	</software>
 
 	<software name="honkefv2">
-		<description>Honke Sankyo Fever 2 - Jikki Simulation (Jpn)</description>
+		<description>Honke Sankyo Fever 2 - Jikki Simulation (Japan)</description>
 		<year>1995</year>
 		<publisher>Boss Comunications</publisher>
 		<info name="serial" value="SHVC-A33J-JPN" />
@@ -43530,7 +43530,7 @@ List of unclassified roms
 	</software>
 
 	<software name="honkefv3">
-		<description>Honke Sankyo Fever 3 - Jikki Simulation (Jpn)</description>
+		<description>Honke Sankyo Fever 3 - Jikki Simulation (Japan)</description>
 		<year>1996</year>
 		<publisher>Boss Comunications</publisher>
 		<info name="serial" value="SHVC-A37J-JPN" />
@@ -43546,7 +43546,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ddanpeis" cloneof="ddanpei">
-		<description>Honoo no Toukyuuji - Dodge Danpei (Jpn, Sample)</description>
+		<description>Honoo no Toukyuuji - Dodge Danpei (Japan, sample)</description>
 		<year>1992</year>
 		<publisher>Sunsoft</publisher>
 		<part name="cart" interface="snes_cart">
@@ -43558,7 +43558,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hookj" cloneof="hook">
-		<description>Hook (Jpn)</description>
+		<description>Hook (Japan)</description>
 		<year>1992</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-HO (ESPG46)" />
@@ -43585,7 +43585,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kirbysda" cloneof="kirbyfun">
-		<description>Hoshi no Kirby - Super Deluxe (Jpn, Rev. A)</description>
+		<description>Hoshi no Kirby - Super Deluxe (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-AKFJ-JPN / G744105" />
@@ -43603,7 +43603,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kirby3j" cloneof="kirby3" supported="partial">
-		<description>Hoshi no Kirby 3 (Jpn)</description>
+		<description>Hoshi no Kirby 3 (Japan)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-AFJJ-JPN" />
@@ -43621,7 +43621,7 @@ List of unclassified roms
 	</software>
 
 	<software name="houkago">
-		<description>Houkago in Beppin Jogakuin (Jpn)</description>
+		<description>Houkago in Beppin Jogakuin (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-ABEJ-JPN" />
@@ -43638,7 +43638,7 @@ List of unclassified roms
 	</software>
 
 	<software name="tscrambl">
-		<description>Hourai Gakuen no Bouken! - Tenkousei Scramble (Jpn)</description>
+		<description>Hourai Gakuen no Bouken! - Tenkousei Scramble (Japan)</description>
 		<year>1996</year>
 		<publisher>J-Wing</publisher>
 		<info name="serial" value="SHVC-AJHJ-JPN" />
@@ -43655,7 +43655,7 @@ List of unclassified roms
 	</software>
 
 	<software name="humangp2" cloneof="f1polep2">
-		<description>Human Grand Prix II (Jpn)</description>
+		<description>Human Grand Prix II (Japan)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-2G" />
@@ -43672,7 +43672,7 @@ List of unclassified roms
 	</software>
 
 	<software name="humangp4">
-		<description>Human Grand Prix IV - F1 Dream Battle (Jpn)</description>
+		<description>Human Grand Prix IV - F1 Dream Battle (Japan)</description>
 		<year>1995</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AG4J-JPN" />
@@ -43714,7 +43714,7 @@ List of unclassified roms
 	</software>
 
 	<software name="huntredj" cloneof="huntred">
-		<description>The Hunt for Red October (Jpn)</description>
+		<description>The Hunt for Red October (Japan)</description>
 		<year>1993</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-RO" />
@@ -43767,7 +43767,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hypriria">
-		<description>Hyper Iria (Jpn)</description>
+		<description>Hyper Iria (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AZEJ-JPN" />
@@ -43782,7 +43782,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hypririas" cloneof="hypriria">
-		<description>Hyper Iria (Jpn, Sample)</description>
+		<description>Hyper Iria (Japan, sample)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<part name="cart" interface="snes_cart">
@@ -43831,7 +43831,7 @@ List of unclassified roms
 	</software>
 
 	<software name="hyperznj" cloneof="hyperzn">
-		<description>HyperZone (Jpn)</description>
+		<description>HyperZone (Japan)</description>
 		<year>1991</year>
 		<publisher>HAL Laboratory</publisher>
 		<info name="serial" value="SHVC-HZ" />
@@ -43859,7 +43859,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ideanohi">
-		<description>Idea no Hi (Jpn)</description>
+		<description>Idea no Hi (Japan)</description>
 		<year>1994</year>
 		<publisher>Shouei System</publisher>
 		<info name="serial" value="SHVC-ID" />
@@ -43903,7 +43903,7 @@ List of unclassified roms
 	</software>
 
 	<software name="igoclub">
-		<description>Igo Club (Jpn)</description>
+		<description>Igo Club (Japan)</description>
 		<year>1996</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-AIVJ-JPN" />
@@ -43921,7 +43921,7 @@ List of unclassified roms
 
 	<software name="ihatov">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Ihatov Monogatari (Jpn)</description>
+		<description>Ihatov Monogatari (Japan)</description>
 		<year>1993</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-H8" />
@@ -43981,7 +43981,7 @@ List of unclassified roms
 	</software>
 
 	<software name="illtimes" cloneof="illtime">
-		<description>Illusion of Time (Spa)</description>
+		<description>Illusion of Time (Spain)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -43996,7 +43996,7 @@ List of unclassified roms
 	</software>
 
 	<software name="illvania">
-		<description>Illvanian no Shiro (Jpn)</description>
+		<description>Illvanian no Shiro (Japan)</description>
 		<year>1994</year>
 		<publisher>Clary</publisher>
 		<info name="serial" value="SHVC-ARIJ-JPN" />
@@ -44026,7 +44026,7 @@ List of unclassified roms
 	</software>
 
 	<software name="inazuma">
-		<description>Inazuma Serve Da! Super Beach Volley (Jpn)</description>
+		<description>Inazuma Serve Da! Super Beach Volley (Japan)</description>
 		<year>1995</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AV7J-JPN" />
@@ -44066,7 +44066,7 @@ List of unclassified roms
 	</software>
 
 	<software name="crashdumj" cloneof="crashdum">
-		<description>The Incredible Crash Dummies (Jpn)</description>
+		<description>The Incredible Crash Dummies (Japan)</description>
 		<year>1994</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-C7" />
@@ -44081,7 +44081,7 @@ List of unclassified roms
 	</software>
 
 	<software name="indyadvj" cloneof="indyadv">
-		<description>Indiana Jones' Greatest Adventures (Jpn)</description>
+		<description>Indiana Jones' Greatest Adventures (Japan)</description>
 		<year>1995</year>
 		<publisher>JVC</publisher>
 		<info name="serial" value="SHVC-AIJJ-JPN" />
@@ -44163,7 +44163,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ittj" cloneof="itt">
-		<description>International Tennis Tour (Jpn)</description>
+		<description>International Tennis Tour (Japan)</description>
 		<year>1993</year>
 		<publisher>Micro World</publisher>
 		<info name="serial" value="SHVC-IT" />
@@ -44193,7 +44193,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ippatsu">
-		<description>Ippatsu Gyakuten (Jpn)</description>
+		<description>Ippatsu Gyakuten (Japan)</description>
 		<year>1996</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-AUMJ-JPN" />
@@ -44223,7 +44223,7 @@ List of unclassified roms
 	</software>
 
 	<software name="mtitlej" cloneof="mtitle">
-		<description>The Irem Major Title (Jpn)</description>
+		<description>The Irem Major Title (Japan)</description>
 		<year>1992</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="SHVC-MT" />
@@ -44275,7 +44275,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ironcommj" cloneof="ironcomm">
-		<description>Iron Commando - Koutetsu no Senshi (Jpn)</description>
+		<description>Iron Commando - Koutetsu no Senshi (Japan)</description>
 		<year>1995</year>
 		<publisher>Poppo</publisher>
 		<info name="serial" value="SHVC-AICJ-JPN" />
@@ -44290,7 +44290,7 @@ List of unclassified roms
 	</software>
 
 	<software name="isozuri">
-		<description>Isozuri - Ritou Hen (Jpn)</description>
+		<description>Isozuri - Ritou Hen (Japan)</description>
 		<year>1996</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-A5IJ-JPN" />
@@ -44332,7 +44332,7 @@ List of unclassified roms
 	</software>
 
 	<software name="itouhata">
-		<description>Itou Hatasu Rokudan no Shougi Doujou (Jpn, Rev. A)</description>
+		<description>Itou Hatasu Rokudan no Shougi Doujou (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-Q2" />
@@ -44350,7 +44350,7 @@ List of unclassified roms
 	</software>
 
 	<software name="itouhata1" cloneof="itouhata">
-		<description>Itou Hatasu Rokudan no Shougi Doujou (Jpn)</description>
+		<description>Itou Hatasu Rokudan no Shougi Doujou (Japan)</description>
 		<year>1994</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-Q2" />
@@ -44393,7 +44393,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jlexct95p" cloneof="jlexct95">
-		<description>J.League Excite Stage '95 (Jpn, prototype)</description>
+		<description>J.League Excite Stage '95 (Japan, prototype)</description>
 		<year>1995</year>
 		<publisher>Epoch</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
@@ -44408,7 +44408,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jlexct96">
-		<description>J.League Excite Stage '96 (Jpn, Rev. A)</description>
+		<description>J.League Excite Stage '96 (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-AE3J-JPN" />
@@ -44426,7 +44426,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jlexct96a" cloneof="jlexct96">
-		<description>J.League Excite Stage '96 (Jpn)</description>
+		<description>J.League Excite Stage '96 (Japan)</description>
 		<year>1996</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-AE3J-JPN" />
@@ -44456,7 +44456,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lotrg" cloneof="lotr">
-		<description>J.R.R. Tolkien's The Lord of the Rings - Volume One (Ger)</description>
+		<description>J.R.R. Tolkien's The Lord of the Rings - Volume One (Germany)</description>
 		<year>1994</year>
 		<publisher>Interplay</publisher>
 		<part name="cart" interface="snes_cart">
@@ -44493,7 +44493,7 @@ List of unclassified roms
 	</software>
 
 	<software name="nicklausf" cloneof="nicklaus">
-		<description>Jack Nicklaus Golf (Fra)</description>
+		<description>Jack Nicklaus Golf (France)</description>
 		<year>1992</year>
 		<publisher>Tradewest</publisher>
 		<part name="cart" interface="snes_cart">
@@ -44518,7 +44518,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jakicrsh">
-		<description>Jaki Crush (Jpn)</description>
+		<description>Jaki Crush (Japan)</description>
 		<year>1992</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-JH" />
@@ -44571,7 +44571,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jammes">
-		<description>Jammes (Jpn)</description>
+		<description>Jammes (Japan)</description>
 		<year>1995</year>
 		<publisher>Carrozzeria Japan</publisher>
 		<info name="serial" value="SHVC-AJMJ-JPN" />
@@ -44599,7 +44599,7 @@ List of unclassified roms
 	</software>
 
 	<software name="janyuuki">
-		<description>Janyuuki - Gokuu Randa (Jpn)</description>
+		<description>Janyuuki - Gokuu Randa (Japan)</description>
 		<year>1995</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AV4J-JPN" />
@@ -44689,7 +44689,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jerryboy" cloneof="smartbal">
-		<description>Jerry Boy (Jpn)</description>
+		<description>Jerry Boy (Japan)</description>
 		<year>1991</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-JB" />
@@ -44717,7 +44717,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jigsaw" cloneof="pieces">
-		<description>Jigsaw Party (Jpn)</description>
+		<description>Jigsaw Party (Japan)</description>
 		<year>1994</year>
 		<publisher>Hori</publisher>
 		<info name="serial" value="SHVC-Z5" />
@@ -44732,7 +44732,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jikkparo">
-		<description>Jikkyou Oshaberi Parodius (Jpn)</description>
+		<description>Jikkyou Oshaberi Parodius (Japan)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AJOJ-JPN" />
@@ -44751,7 +44751,7 @@ List of unclassified roms
 	</software>
 
 	<software name="powyak2">
-		<description>Jikkyou Powerful Pro Yakyuu 2 (Jpn, Rev. B)</description>
+		<description>Jikkyou Powerful Pro Yakyuu 2 (Japan, Rev. B)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AP2J-JPN" />
@@ -44769,7 +44769,7 @@ List of unclassified roms
 	</software>
 
 	<software name="powyk397">
-		<description>Jikkyou Powerful Pro Yakyuu 3 - '97 Haru (Jpn, Rev. A)</description>
+		<description>Jikkyou Powerful Pro Yakyuu 3 - '97 Haru (Japan, Rev. A)</description>
 		<year>1997</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AQ7J-JPN" />
@@ -44787,7 +44787,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jikkscr2">
-		<description>Jikkyou World Soccer 2 - Fighting Eleven (Jpn, Rev. A, NP)</description>
+		<description>Jikkyou World Soccer 2 - Fighting Eleven (Japan, Rev. A, NP)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AWJJ-JPN" />
@@ -44805,7 +44805,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jikkscr2p" cloneof="jikkscr2">
-		<description>Jikkyou World Soccer 2 - Fighting Eleven (Jpn, prototype)</description>
+		<description>Jikkyou World Soccer 2 - Fighting Eleven (Japan, prototype)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
@@ -44869,7 +44869,7 @@ List of unclassified roms
 	</software>
 
 	<software name="connorsf" cloneof="connors">
-		<description>Jimmy Connors Pro Tennis Tour (Fra)</description>
+		<description>Jimmy Connors Pro Tennis Tour (France)</description>
 		<year>1992</year>
 		<publisher>Ubi Soft</publisher>
 		<part name="cart" interface="snes_cart">
@@ -44893,7 +44893,7 @@ List of unclassified roms
 	</software>
 
 	<software name="connorsj" cloneof="connors">
-		<description>Jimmy Connors Pro Tennis Tour (Jpn)</description>
+		<description>Jimmy Connors Pro Tennis Tour (Japan)</description>
 		<year>1993</year>
 		<publisher>Misawa Entertainment</publisher>
 		<info name="serial" value="SHVC-JC" />
@@ -44936,7 +44936,7 @@ List of unclassified roms
 	</software>
 
 	<software name="bassusa" cloneof="jimmyhou">
-		<description>Jissen Bass Fishing Hisshouhou in USA (Jpn)</description>
+		<description>Jissen Bass Fishing Hisshouhou in USA (Japan)</description>
 		<year>1995</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AFUJ-JPN" />
@@ -44953,7 +44953,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jissenky">
-		<description>Jissen Kyoutei (Jpn)</description>
+		<description>Jissen Kyoutei (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AKOJ-JPN" />
@@ -44970,7 +44970,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jpslottw">
-		<description>Jissen Pachi-Slot Hisshouhou! Twin (Jpn)</description>
+		<description>Jissen Pachi-Slot Hisshouhou! Twin (Japan)</description>
 		<year>1997</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AZHJ-JPN" />
@@ -44987,7 +44987,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jpslott2">
-		<description>Jissen Pachi-Slot Hisshouhou! Twin Vol. 2 (Jpn)</description>
+		<description>Jissen Pachi-Slot Hisshouhou! Twin Vol. 2 (Japan)</description>
 		<year>1997</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AZOJ-JPN" />
@@ -45004,7 +45004,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jpachih2">
-		<description>Jissen Pachinko Hisshouhou! 2 (Jpn)</description>
+		<description>Jissen Pachinko Hisshouhou! 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-A9ZJ-JPN" />
@@ -45022,7 +45022,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jissenmj">
-		<description>Jissen! Mahjong Shinan (Jpn)</description>
+		<description>Jissen! Mahjong Shinan (Japan)</description>
 		<year>1995</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-AJIJ-JPN" />
@@ -45039,7 +45039,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jpslothc">
-		<description>Jissen! Pachi-Slot Hisshouhou! Classic (Jpn)</description>
+		<description>Jissen! Pachi-Slot Hisshouhou! Classic (Japan)</description>
 		<year>1995</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AJCJ-JPN" />
@@ -45056,7 +45056,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jpslothy">
-		<description>Jissen! Pachi-Slot Hisshouhou! Yamasa Densetsu (Jpn)</description>
+		<description>Jissen! Pachi-Slot Hisshouhou! Yamasa Densetsu (Japan)</description>
 		<year>1996</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-AY8J-JPN" />
@@ -45111,7 +45111,7 @@ List of unclassified roms
 	</software>
 
 	<software name="joemacj" cloneof="joemac">
-		<description>Joe &amp; Mac - Tatakae Genshijin (Jpn)</description>
+		<description>Joe &amp; Mac - Tatakae Genshijin (Japan)</description>
 		<year>1991</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-JT" />
@@ -45229,7 +45229,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jojo">
-		<description>JoJo no Kimyou na Bouken (Jpn)</description>
+		<description>JoJo no Kimyou na Bouken (Japan)</description>
 		<year>1993</year>
 		<publisher>Cobra Team</publisher>
 		<info name="serial" value="SHVC-JK" />
@@ -45246,7 +45246,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jdreddj" cloneof="jdredd">
-		<description>Judge Dredd (Jpn)</description>
+		<description>Judge Dredd (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AJDJ-JPN" />
@@ -45261,7 +45261,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jdreddus" cloneof="jdredd">
-		<description>Judge Dredd (USA, Sample)</description>
+		<description>Judge Dredd (USA, sample)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<part name="cart" interface="snes_cart">
@@ -45286,7 +45286,7 @@ List of unclassified roms
 	</software>
 
 	<software name="holein1j" cloneof="holein1">
-		<description>Jumbo Ozaki no Hole in One (Jpn)</description>
+		<description>Jumbo Ozaki no Hole in One (Japan)</description>
 		<year>1991</year>
 		<publisher>HAL Laboratory</publisher>
 		<info name="serial" value="SHVC-JO" />
@@ -45301,7 +45301,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jumpind" supported="partial">
-		<description>Jumpin' Derby (Jpn)</description>
+		<description>Jumpin' Derby (Japan)</description>
 		<year>1996</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-AJUJ-JPN" />
@@ -45319,7 +45319,7 @@ List of unclassified roms
 	</software>
 
 	<software name="junglej" cloneof="jungle">
-		<description>Walt Disney's Classics - The Jungle Book (Jpn)</description>
+		<description>Walt Disney's Classics - The Jungle Book (Japan)</description>
 		<year>1994</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-7K" />
@@ -45359,7 +45359,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jstrikej" cloneof="jstrike">
-		<description>Jungle Strike (Jpn)</description>
+		<description>Jungle Strike (Japan)</description>
 		<year>1995</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-AJGJ-JPN" />
@@ -45374,7 +45374,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jwars2">
-		<description>Jungle Wars 2 - Kodai Mahou Atimos no Nazo (Jpn)</description>
+		<description>Jungle Wars 2 - Kodai Mahou Atimos no Nazo (Japan)</description>
 		<year>1993</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-JW (R95V5945)" />
@@ -45415,7 +45415,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jparkf" cloneof="jpark">
-		<description>Jurassic Park (Fra)</description>
+		<description>Jurassic Park (France)</description>
 		<year>1993</year>
 		<publisher>Ocean</publisher>
 		<part name="cart" interface="snes_cart">
@@ -45427,7 +45427,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jparkg" cloneof="jpark">
-		<description>Jurassic Park (Ger)</description>
+		<description>Jurassic Park (Germany)</description>
 		<year>1993</year>
 		<publisher>Ocean</publisher>
 		<part name="cart" interface="snes_cart">
@@ -45439,7 +45439,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jparki" cloneof="jpark">
-		<description>Jurassic Park (Ita)</description>
+		<description>Jurassic Park (Italy)</description>
 		<year>1993</year>
 		<publisher>Ocean</publisher>
 		<part name="cart" interface="snes_cart">
@@ -45451,7 +45451,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jparkj" cloneof="jpark">
-		<description>Jurassic Park (Jpn)</description>
+		<description>Jurassic Park (Japan)</description>
 		<year>1994</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-J8" />
@@ -45467,7 +45467,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jparks" cloneof="jpark">
-		<description>Jurassic Park (Spa)</description>
+		<description>Jurassic Park (Spain)</description>
 		<year>1993</year>
 		<publisher>Ocean</publisher>
 		<part name="cart" interface="snes_cart">
@@ -45528,7 +45528,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jleaguej" cloneof="jleague">
-		<description>Justice League Task Force (Jpn)</description>
+		<description>Justice League Task Force (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AJLJ-JPN" />
@@ -45556,7 +45556,7 @@ List of unclassified roms
 	</software>
 
 	<software name="jwpjoshi">
-		<description>JWP Joshi Pro Wrestling - Pure Wrestle Queens (Jpn)</description>
+		<description>JWP Joshi Pro Wrestling - Pure Wrestle Queens (Japan)</description>
 		<year>1994</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-AJWJ-JPN" />
@@ -45572,7 +45572,7 @@ List of unclassified roms
 	</software>
 
 	<software name="rummenig" cloneof="keeganpm">
-		<description>K.H. Rummenigge's Player Manager (Ger)</description>
+		<description>K.H. Rummenigge's Player Manager (Germany)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -45587,7 +45587,7 @@ List of unclassified roms
 	</software>
 
 	<software name="rummenigs" cloneof="keeganpm">
-		<description>K.H. Rummenigge's Player Manager (Ger, Demo 20 Weeks)</description>
+		<description>K.H. Rummenigge's Player Manager (Germany, Demo 20 Weeks)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -45602,7 +45602,7 @@ List of unclassified roms
 	</software>
 
 	<software name="rummenigso" cloneof="keeganpm">
-		<description>K.H. Rummenigge's Player Manager (Ger, Demo 10 Weeks)</description>
+		<description>K.H. Rummenigge's Player Manager (Germany, Demo 10 Weeks)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -45630,7 +45630,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kabukimj">
-		<description>Kabuki Chou Reach Mahjong Tonpuusen (Jpn)</description>
+		<description>Kabuki Chou Reach Mahjong Tonpuusen (Japan)</description>
 		<year>1994</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-IF (R88V5949)" />
@@ -45647,7 +45647,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kabukirc">
-		<description>Kabuki Rocks (Jpn)</description>
+		<description>Kabuki Rocks (Japan)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-QR" />
@@ -45664,7 +45664,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kachoush">
-		<description>Kachou Shima Kousaku (Jpn)</description>
+		<description>Kachou Shima Kousaku (Japan)</description>
 		<year>1993</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-UK" />
@@ -45681,7 +45681,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kagaharl" cloneof="harley">
-		<description>Kagakusha Harley no Haran Banjou (Jpn)</description>
+		<description>Kagakusha Harley no Haran Banjou (Japan)</description>
 		<year>1994</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-HV" />
@@ -45696,7 +45696,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kakinoki" supported="partial">
-		<description>Kakinoki Shougi (Jpn)</description>
+		<description>Kakinoki Shougi (Japan)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AKAJ-JPN" />
@@ -45714,7 +45714,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kamenrid">
-		<description>Kamen Rider (Jpn)</description>
+		<description>Kamen Rider (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-K4" />
@@ -45729,7 +45729,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kamenrsd">
-		<description>Kamen Rider SD - Shutsugeki!! Rider Machine (Jpn)</description>
+		<description>Kamen Rider SD - Shutsugeki!! Rider Machine (Japan)</description>
 		<year>1993</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-KA" />
@@ -45744,7 +45744,7 @@ List of unclassified roms
 	</software>
 
 	<software name="karuraou" cloneof="skyblazr">
-		<description>Karura Ou (Jpn)</description>
+		<description>Karura Ou (Japan)</description>
 		<year>1994</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-OH (ESPG51)" />
@@ -45759,7 +45759,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kashiwag">
-		<description>Kashiwagi Shigetaka no Top Water Bassing (Jpn)</description>
+		<description>Kashiwagi Shigetaka no Top Water Bassing (Japan)</description>
 		<year>1995</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-AVFJ-JPN" />
@@ -45775,7 +45775,7 @@ List of unclassified roms
 	</software>
 
 	<software name="katsrun">
-		<description>Kat's Run - Zen-Nihon K-Car Senshuken (Jpn)</description>
+		<description>Kat's Run - Zen-Nihon K-Car Senshuken (Japan)</description>
 		<year>1995</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-AKCJ-JPN" />
@@ -45790,7 +45790,7 @@ List of unclassified roms
 	</software>
 
 	<software name="katohifu">
-		<description>Katou Hifumi Kudan - Shougi Club (Jpn)</description>
+		<description>Katou Hifumi Kudan - Shougi Club (Japan)</description>
 		<year>1997</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-A9HJ-JPN" />
@@ -45830,7 +45830,7 @@ List of unclassified roms
 	</software>
 
 	<software name="keeper">
-		<description>Keeper (Jpn)</description>
+		<description>Keeper (Japan)</description>
 		<year>1994</year>
 		<publisher>Datam Polystar</publisher>
 		<info name="serial" value="SHVC-K9" />
@@ -45845,7 +45845,7 @@ List of unclassified roms
 	</software>
 
 	<software name="keiba8s">
-		<description>Keiba Eight Special (Jpn, Rev. A)</description>
+		<description>Keiba Eight Special (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Misawa Entertainment</publisher>
 		<info name="serial" value="SHVC-8K" />
@@ -45862,7 +45862,7 @@ List of unclassified roms
 	</software>
 
 	<software name="keiba8sa" cloneof="keiba8s">
-		<description>Keiba Eight Special (Jpn)</description>
+		<description>Keiba Eight Special (Japan)</description>
 		<year>1993</year>
 		<publisher>Misawa Entertainment</publisher>
 		<info name="serial" value="SHVC-8K" />
@@ -45892,7 +45892,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kentouou" cloneof="tko">
-		<description>Kentou Ou World Champion (Jpn)</description>
+		<description>Kentou Ou World Champion (Japan)</description>
 		<year>1992</year>
 		<publisher>Sofel</publisher>
 		<info name="serial" value="SHVC-BX" />
@@ -45907,7 +45907,7 @@ List of unclassified roms
 	</software>
 
 	<software name="yaiba">
-		<description>Kenyuu Densetsu Yaiba (Jpn)</description>
+		<description>Kenyuu Densetsu Yaiba (Japan)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-YB" />
@@ -45925,7 +45925,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kerokero">
-		<description>Kero Kero Keroppi no Bouken Nikki - Nemureru Mori no Keroleen (Jpn)</description>
+		<description>Kero Kero Keroppi no Bouken Nikki - Nemureru Mori no Keroleen (Japan)</description>
 		<year>1994</year>
 		<publisher>Character Soft</publisher>
 		<info name="serial" value="SHVC-NE" />
@@ -46022,7 +46022,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kidklownj" cloneof="kidklown">
-		<description>Kid Klown no Crazy Chase (Jpn)</description>
+		<description>Kid Klown no Crazy Chase (Japan)</description>
 		<year>1994</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-ZI" />
@@ -46049,7 +46049,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ggundam">
-		<description>Kidou Butouden G Gundam (Jpn)</description>
+		<description>Kidou Butouden G Gundam (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AGMJ-JPN" />
@@ -46064,7 +46064,7 @@ List of unclassified roms
 	</software>
 
 	<software name="zgundam">
-		<description>Kidou Senshi Z Gundam - Away to the Newtype (Jpn)</description>
+		<description>Kidou Senshi Z Gundam - Away to the Newtype (Japan)</description>
 		<year>1996</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AO6J-JPN" />
@@ -46081,7 +46081,7 @@ List of unclassified roms
 	</software>
 
 	<software name="dion" cloneof="imperium">
-		<description>Kidou Soukou Dion (Jpn)</description>
+		<description>Kidou Soukou Dion (Japan)</description>
 		<year>1992</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="SHVC-DY" />
@@ -46109,7 +46109,7 @@ List of unclassified roms
 	</software>
 
 	<software name="patlabor">
-		<description>Kidou Keisatsu Patlabor (Jpn)</description>
+		<description>Kidou Keisatsu Patlabor (Japan)</description>
 		<year>1994</year>
 		<publisher>BEC</publisher>
 		<info name="serial" value="SHVC-PX" />
@@ -46127,7 +46127,7 @@ List of unclassified roms
 
 	<software name="kikikain" cloneof="pocky">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Kiki KaiKai - Nazo no Kuro Manteau (Jpn)</description>
+		<description>Kiki KaiKai - Nazo no Kuro Manteau (Japan)</description>
 		<year>1992</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="SHVC-KK" />
@@ -46142,7 +46142,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kikikait" cloneof="pocky2">
-		<description>Kiki KaiKai - Tsukiyo Soushi (Jpn)</description>
+		<description>Kiki KaiKai - Tsukiyo Soushi (Japan)</description>
 		<year>1994</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="SHVC-3N" />
@@ -46157,7 +46157,7 @@ List of unclassified roms
 	</software>
 
 	<software name="metaljckj" cloneof="metaljck">
-		<description>Kikou Keisatsu Metal Jack (Jpn)</description>
+		<description>Kikou Keisatsu Metal Jack (Japan)</description>
 		<year>1992</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-MJ" />
@@ -46172,7 +46172,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kikunima">
-		<description>Kikuni Masahiko no Jantoushi Doraou (Jpn)</description>
+		<description>Kikuni Masahiko no Jantoushi Doraou (Japan)</description>
 		<year>1993</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-JD" />
@@ -46187,7 +46187,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kikunim2">
-		<description>Kikuni Masahiko no Jantoushi Doraou 2 (Jpn)</description>
+		<description>Kikuni Masahiko no Jantoushi Doraou 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-2K" />
@@ -46229,7 +46229,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kindaimj">
-		<description>Kindai Mahjong Special (Jpn)</description>
+		<description>Kindai Mahjong Special (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AKJJ-JPN" />
@@ -46268,7 +46268,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kodj" cloneof="kod">
-		<description>The King of Dragons (Jpn)</description>
+		<description>The King of Dragons (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-EI" />
@@ -46296,7 +46296,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kingrall">
-		<description>The King of Rally (Jpn)</description>
+		<description>The King of Rally (Japan)</description>
 		<year>1992</year>
 		<publisher>Meldac</publisher>
 		<info name="serial" value="SHVC-KP" />
@@ -46349,7 +46349,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kingchu">
-		<description>Kingyo Chuuihou! - Tobidase! Game Gakuen (Jpn)</description>
+		<description>Kingyo Chuuihou! - Tobidase! Game Gakuen (Japan)</description>
 		<year>1994</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-J7" />
@@ -46364,7 +46364,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kinnikum">
-		<description>Kinnikuman - Dirty Challenger (Jpn)</description>
+		<description>Kinnikuman - Dirty Challenger (Japan)</description>
 		<year>1992</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-KI" />
@@ -46379,7 +46379,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kirbykk">
-		<description>Kirby no Kirakira Kids (Jpn)</description>
+		<description>Kirby no Kirakira Kids (Japan)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BKKJ-JPN" />
@@ -46442,7 +46442,7 @@ List of unclassified roms
 	</software>
 
 	<software name="zenkibr">
-		<description>Kishin Douji Zenki - Battle Raiden (Jpn)</description>
+		<description>Kishin Douji Zenki - Battle Raiden (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AZ6J-JPN" />
@@ -46458,7 +46458,7 @@ List of unclassified roms
 	</software>
 
 	<software name="zenkidr">
-		<description>Kishin Douji Zenki - Denei Raibu (Jpn)</description>
+		<description>Kishin Douji Zenki - Denei Raibu (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AZDJ-JPN" />
@@ -46473,7 +46473,7 @@ List of unclassified roms
 	</software>
 
 	<software name="zenkitm">
-		<description>Kishin Douji Zenki - Tenchi Meidou (Jpn)</description>
+		<description>Kishin Douji Zenki - Tenchi Meidou (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AZTJ-JPN" />
@@ -46488,7 +46488,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kishinkop" cloneof="kishinko">
-		<description>Kishin Kourinden Oni (Jpn, prototype)</description>
+		<description>Kishin Kourinden Oni (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Banpresto</publisher>
 		<part name="cart" interface="snes_cart">
@@ -46502,7 +46502,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kiterets">
-		<description>Kiteretsu Daihyakka - Choujikuu Sugoroku (Jpn)</description>
+		<description>Kiteretsu Daihyakka - Choujikuu Sugoroku (Japan)</description>
 		<year>1995</year>
 		<publisher>Video System</publisher>
 		<info name="serial" value="SHVC-AVKJ-JPN" />
@@ -46532,7 +46532,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kotrj" cloneof="kotr">
-		<description>Knights of the Round (Jpn)</description>
+		<description>Knights of the Round (Japan)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-LO" />
@@ -46561,7 +46561,7 @@ List of unclassified roms
 	</software>
 
 	<software name="konpeki">
-		<description>Konpeki no Kantai (Jpn)</description>
+		<description>Konpeki no Kantai (Japan)</description>
 		<year>1995</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-ADFJ-JPN" />
@@ -46578,7 +46578,7 @@ List of unclassified roms
 	</software>
 
 	<software name="casinobr">
-		<description>Kouryaku Casino Bar (Jpn)</description>
+		<description>Kouryaku Casino Bar (Japan)</description>
 		<year>1995</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AOOJ-JPN" />
@@ -46593,7 +46593,7 @@ List of unclassified roms
 	</software>
 
 	<software name="koryumim">
-		<description>Kouryuu no Mimi (Jpn)</description>
+		<description>Kouryuu no Mimi (Japan)</description>
 		<year>1995</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-AKVJ-JPN" />
@@ -46608,7 +46608,7 @@ List of unclassified roms
 	</software>
 
 	<software name="koshien2">
-		<description>Koushien 2 (Jpn)</description>
+		<description>Koushien 2 (Japan)</description>
 		<year>1992</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="SHVC-KQ" />
@@ -46625,7 +46625,7 @@ List of unclassified roms
 	</software>
 
 	<software name="koshien3">
-		<description>Koushien 3 (Jpn)</description>
+		<description>Koushien 3 (Japan)</description>
 		<year>1994</year>
 		<publisher>Magical</publisher>
 		<info name="serial" value="SHVC-3V" />
@@ -46642,7 +46642,7 @@ List of unclassified roms
 	</software>
 
 	<software name="koshien4">
-		<description>Koushien 4 (Jpn)</description>
+		<description>Koushien 4 (Japan)</description>
 		<year>1995</year>
 		<publisher>Magical</publisher>
 		<info name="serial" value="SHVC-A4VJ-JPN" />
@@ -46660,7 +46660,7 @@ List of unclassified roms
 
 	<software name="koukishi">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Koutetsu no Kishi (Jpn)</description>
+		<description>Koutetsu no Kishi (Japan)</description>
 		<year>1993</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-PZ" />
@@ -46677,7 +46677,7 @@ List of unclassified roms
 	</software>
 
 	<software name="koukish2">
-		<description>Koutetsu no Kishi 2 - Sabaku no Rommel Gundan (Jpn)</description>
+		<description>Koutetsu no Kishi 2 - Sabaku no Rommel Gundan (Japan)</description>
 		<year>1994</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-2Z" />
@@ -46695,7 +46695,7 @@ List of unclassified roms
 	</software>
 
 	<software name="koukish3">
-		<description>Koutetsu no Kishi 3 - Gekitotsu Europe Sensen (Jpn)</description>
+		<description>Koutetsu no Kishi 3 - Gekitotsu Europe Sensen (Japan)</description>
 		<year>1995</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-APZJ-JPN" />
@@ -46713,7 +46713,7 @@ List of unclassified roms
 	</software>
 
 	<software name="krustywj" cloneof="krustyfh">
-		<description>Krusty World (Jpn)</description>
+		<description>Krusty World (Japan)</description>
 		<year>1993</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-FH" />
@@ -46765,7 +46765,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kunioode">
-		<description>Kunio no Oden (Jpn)</description>
+		<description>Kunio no Oden (Japan)</description>
 		<year>1994</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-QO" />
@@ -46780,7 +46780,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kuniodb">
-		<description>Kunio-kun no Dodge Ball Da yo Zenin Shuugou! (Jpn)</description>
+		<description>Kunio-kun no Dodge Ball Da yo Zenin Shuugou! (Japan)</description>
 		<year>1993</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-ND" />
@@ -46797,7 +46797,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kuniodbs">
-		<description>Kunio-kun no Dodge Ball Da yo Zenin Shuugou! - Tournament Special (Jpn, Not for sale)</description>
+		<description>Kunio-kun no Dodge Ball Da yo Zenin Shuugou! - Tournament Special (Japan, not for sale)</description>
 		<year>1993</year>
 		<publisher>Technos Japan Corporation</publisher>
 		<info name="serial" value="n/a" /> <!-- Notes: The cartridge has no serial surprisingly enough -->
@@ -46815,7 +46815,7 @@ List of unclassified roms
 	</software>
 
 	<software name="gulliver">
-		<description>Kuusou Kagaku Sekai Gulliver Boy (Jpn)</description>
+		<description>Kuusou Kagaku Sekai Gulliver Boy (Japan)</description>
 		<year>1996</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AKUJ-JPN" />
@@ -46845,7 +46845,7 @@ List of unclassified roms
 	</software>
 
 	<software name="kmegami">
-		<description>Kyuuyaku Megami Tensei (Jpn)</description>
+		<description>Kyuuyaku Megami Tensei (Japan)</description>
 		<year>1995</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-AKMJ-JPN" />
@@ -46863,7 +46863,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lawares">
-		<description>La Wares (Jpn)</description>
+		<description>La Wares (Japan)</description>
 		<year>1995</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-A8YJ-JPN" />
@@ -46880,7 +46880,7 @@ List of unclassified roms
 	</software>
 
 	<software name="ladystal">
-		<description>Lady Stalker - Kako kara no Chousen (Jpn)</description>
+		<description>Lady Stalker - Kako kara no Chousen (Japan)</description>
 		<year>1995</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-ALSJ-JPN" />
@@ -46911,7 +46911,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lagoong" cloneof="lagoon">
-		<description>Lagoon (Ger)</description>
+		<description>Lagoon (Germany)</description>
 		<year>1991</year>
 		<publisher>Kemco</publisher>
 		<part name="cart" interface="snes_cart">
@@ -46925,7 +46925,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lagoonj" cloneof="lagoon">
-		<description>Lagoon (Jpn)</description>
+		<description>Lagoon (Japan)</description>
 		<year>1991</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-LA" />
@@ -46970,7 +46970,7 @@ List of unclassified roms
 	</software>
 
 	<software name="langriss">
-		<description>Der Langrisser (Jpn, Rev. A)</description>
+		<description>Der Langrisser (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-ALGJ-JPN" />
@@ -46987,7 +46987,7 @@ List of unclassified roms
 	</software>
 
 	<software name="laplace">
-		<description>Laplace no Ma (Jpn)</description>
+		<description>Laplace no Ma (Japan)</description>
 		<year>1995</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="SHVC-ADLJ-JPN" />
@@ -47004,7 +47004,7 @@ List of unclassified roms
 	</software>
 
 	<software name="larrynix1" cloneof="tnnbass">
-		<description>Larry Nixon's Super Bass Fishing (Jpn)</description>
+		<description>Larry Nixon's Super Bass Fishing (Japan)</description>
 		<year>1994</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="SHVC-QJ (KIS-4)" />
@@ -47047,7 +47047,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lastbatl">
-		<description>The Last Battle (Jpn)</description>
+		<description>The Last Battle (Japan)</description>
 		<year>1994</year>
 		<publisher>Teichiku</publisher>
 		<info name="serial" value="SHVC-3T" />
@@ -47101,7 +47101,7 @@ List of unclassified roms
 	</software>
 
 	<software name="leadingc">
-		<description>Leading Company (Jpn)</description>
+		<description>Leading Company (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-LC" />
@@ -47118,7 +47118,7 @@ List of unclassified roms
 	</software>
 
 	<software name="leadjock">
-		<description>Leading Jockey (Jpn)</description>
+		<description>Leading Jockey (Japan)</description>
 		<year>1994</year>
 		<publisher>Carrozzeria Japan</publisher>
 		<info name="serial" value="SHVC-L9" />
@@ -47135,7 +47135,7 @@ List of unclassified roms
 	</software>
 
 	<software name="leadjoc2">
-		<description>Leading Jockey 2 (Jpn)</description>
+		<description>Leading Jockey 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Carrozzeria Japan</publisher>
 		<info name="serial" value="SHVC-ALJJ-JPN" />
@@ -47252,7 +47252,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lemming2j" cloneof="lemming2">
-		<description>Lemmings 2 - The Tribes (Jpn)</description>
+		<description>Lemmings 2 - The Tribes (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-L2" />
@@ -47324,7 +47324,7 @@ List of unclassified roms
 	</software>
 
 	<software name="libbler">
-		<description>Libble Rabble (Jpn)</description>
+		<description>Libble Rabble (Japan)</description>
 		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-26" />
@@ -47355,7 +47355,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lfantasy">
-		<description>Light Fantasy (Jpn)</description>
+		<description>Light Fantasy (Japan)</description>
 		<year>1992</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-LF" />
@@ -47372,7 +47372,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lfantas2">
-		<description>Light Fantasy II (Jpn)</description>
+		<description>Light Fantasy II (Japan)</description>
 		<year>1995</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-ALRJ-JPN" />
@@ -47389,7 +47389,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lionkingj" cloneof="lionking">
-		<description>The Lion King (Jpn)</description>
+		<description>The Lion King (Japan)</description>
 		<year>1994</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-ALKJ-JPN" />
@@ -47404,7 +47404,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lilmagicjp" cloneof="lilmagic">
-		<description>Little Magic (Jpn, prototype)</description>
+		<description>Little Magic (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Altron</publisher>
 		<part name="cart" interface="snes_cart">
@@ -47416,7 +47416,7 @@ List of unclassified roms
 	</software>
 
 	<software name="lilmagicj" cloneof="lilmagic">
-		<description>Little Magic (Jpn)</description>
+		<description>Little Magic (Japan)</description>
 		<year>1993</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-LI" />
@@ -47431,7 +47431,7 @@ List of unclassified roms
 	</software>
 
 	<software name="litlemst">
-		<description>Little Master - Nijiiro no Maseki (Jpn)</description>
+		<description>Little Master - Nijiiro no Maseki (Japan)</description>
 		<year>1995</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="SHVC-ALMJ-JPN" />
@@ -47462,7 +47462,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ldruntw">
-		<description>Lode Runner Twin - Justy to Liberty no Daibouken (Jpn)</description>
+		<description>Lode Runner Twin - Justy to Liberty no Daibouken (Japan)</description>
 		<year>1994</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-7Z" />
@@ -47478,7 +47478,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="lodoss">
-		<description>Lodoss-tou Senki (Jpn)</description>
+		<description>Lodoss-tou Senki (Japan)</description>
 		<year>1995</year>
 		<publisher>Kadokawa Shoten</publisher>
 		<info name="serial" value="SHVC-ALWJ-JPN" />
@@ -47495,7 +47495,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="logos">
-		<description>Logos Panic Goaisatsu (Jpn)</description>
+		<description>Logos Panic Goaisatsu (Japan)</description>
 		<year>1995</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-A6YJ-JPN" />
@@ -47510,7 +47510,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="lordmonaa" cloneof="lordmona">
-		<description>Lord Monarch (Jpn)</description>
+		<description>Lord Monarch (Japan)</description>
 		<year>1992</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-LM" />
@@ -47527,7 +47527,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="lordmona">
-		<description>Lord Monarch (Jpn, Rev. A, NP)</description>
+		<description>Lord Monarch (Japan, Rev. A, NP)</description>
 		<year>1992</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-LM" />
@@ -47570,7 +47570,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="lostvikf" cloneof="lostvik">
-		<description>The Lost Vikings (Fra)</description>
+		<description>The Lost Vikings (France)</description>
 		<year>1993</year>
 		<publisher>Interplay</publisher>
 		<part name="cart" interface="snes_cart">
@@ -47582,7 +47582,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="lostviks" cloneof="lostvik">
-		<description>The Lost Vikings (Spa)</description>
+		<description>The Lost Vikings (Spain)</description>
 		<year>1993</year>
 		<publisher>Interplay</publisher>
 		<part name="cart" interface="snes_cart">
@@ -47619,7 +47619,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="lotharss" cloneof="manchest">
-		<description>Lothar Matthäus Super Soccer (Ger)</description>
+		<description>Lothar Matthäus Super Soccer (Germany)</description>
 		<year>1995</year>
 		<publisher>Ocean</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -47632,7 +47632,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="loveqst">
-		<description>Love Quest (Jpn)</description>
+		<description>Love Quest (Japan)</description>
 		<year>1995</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="SHVC-ALQJ-JPN" />
@@ -47690,7 +47690,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="lufia2s" cloneof="lufia2">
-		<description>Lufia (Spa)</description>
+		<description>Lufia (Spain)</description>
 		<year>1996</year>
 		<publisher>Natsume</publisher>
 		<part name="cart" interface="snes_cart">
@@ -47718,7 +47718,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="lupin3">
-		<description>Lupin Sansei - Densetsu no Hihou o Oe! (Jpn)</description>
+		<description>Lupin Sansei - Densetsu no Hihou o Oe! (Japan)</description>
 		<year>1994</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="SHVC-ALPJ-JPN" />
@@ -47745,7 +47745,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="madden96s" cloneof="madden96">
-		<description>Madden NFL 96 (USA, Sample)</description>
+		<description>Madden NFL 96 (USA, sample)</description>
 		<year>1995</year>
 		<publisher>Electronic Arts</publisher>
 		<part name="cart" interface="snes_cart">
@@ -47789,7 +47789,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="madoum">
-		<description>Madou Monogatari - Hanamaru Daiyouchienji (Jpn)</description>
+		<description>Madou Monogatari - Hanamaru Daiyouchienji (Japan)</description>
 		<year>1996</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="SHVC-ADYJ-JPN" />
@@ -47806,7 +47806,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="cotton">
-		<description>Märchen Adventure Cotton 100% (Jpn)</description>
+		<description>Märchen Adventure Cotton 100% (Japan)</description>
 		<year>1994</year>
 		<publisher>Datam Polystar</publisher>
 		<info name="serial" value="SHVC-C9" />
@@ -47858,7 +47858,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="magicj" cloneof="sslamdnk">
-		<description>Magic Johnson no Super Slam Dunk (Jpn)</description>
+		<description>Magic Johnson no Super Slam Dunk (Japan)</description>
 		<year>1993</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-D9" />
@@ -47873,7 +47873,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="rayearth">
-		<description>Magic Knight Rayearth (Jpn)</description>
+		<description>Magic Knight Rayearth (Japan)</description>
 		<year>1995</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-AURJ-JPN" />
@@ -47915,7 +47915,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="magdrop">
-		<description>Magical Drop (Jpn)</description>
+		<description>Magical Drop (Japan)</description>
 		<year>1995</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-AD7J-JPN" />
@@ -47930,7 +47930,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="magdrop2">
-		<description>Magical Drop 2 (Jpn)</description>
+		<description>Magical Drop 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-AOKJ-JPN" />
@@ -47945,7 +47945,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="magdrop2bh" cloneof="magdrop2">
-		<description>Magical Drop 2 (Jpn, Bunka Housou Special Version)</description>
+		<description>Magical Drop 2 (Japan, Bunka Housou Special Version)</description>
 		<year>1996</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-AOQJ-JPN" />
@@ -47960,7 +47960,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="magpopn">
-		<description>Magical Pop'n (Jpn)</description>
+		<description>Magical Pop'n (Japan)</description>
 		<year>1995</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-AIAJ-JPN" />
@@ -47988,7 +47988,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mickeymqg" cloneof="mickeymq">
-		<description>The Magical Quest Starring Mickey Mouse (Ger, Rev. A)</description>
+		<description>The Magical Quest Starring Mickey Mouse (Germany, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<part name="cart" interface="snes_cart">
@@ -48025,7 +48025,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="magnabrb">
-		<description>Magna Braban - Henreki no Yuusha (Jpn)</description>
+		<description>Magna Braban - Henreki no Yuusha (Japan)</description>
 		<year>1994</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-AMBJ-JPN" />
@@ -48042,7 +48042,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjclub">
-		<description>Mahjong Club (Jpn)</description>
+		<description>Mahjong Club (Japan)</description>
 		<year>1994</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-AHMJ-JPN" />
@@ -48057,7 +48057,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjgokutn">
-		<description>Mahjong Gokuu Tenjiku (Jpn)</description>
+		<description>Mahjong Gokuu Tenjiku (Japan)</description>
 		<year>1994</year>
 		<publisher>Chat Noir</publisher>
 		<info name="serial" value="SHVC-59" />
@@ -48074,7 +48074,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjhanjou">
-		<description>Mahjong Hanjouki (Jpn)</description>
+		<description>Mahjong Hanjouki (Japan)</description>
 		<year>1995</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AHVJ-JPN" />
@@ -48089,7 +48089,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjhishou">
-		<description>Mahjong Hishouden - Shin Naki no Ryuu (Jpn)</description>
+		<description>Mahjong Hishouden - Shin Naki no Ryuu (Japan)</description>
 		<year>1995</year>
 		<publisher>BEC</publisher>
 		<info name="serial" value="SHVC-ARUJ-JPN" />
@@ -48104,7 +48104,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjsengok">
-		<description>Mahjong Sengoku Monogatari (Jpn)</description>
+		<description>Mahjong Sengoku Monogatari (Japan)</description>
 		<year>1994</year>
 		<publisher>Yojigen</publisher>
 		<info name="serial" value="SHVC-Y3" />
@@ -48121,7 +48121,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjtaika2">
-		<description>Mahjong Taikai II (Jpn, Rev. A)</description>
+		<description>Mahjong Taikai II (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AIQJ-JPN" />
@@ -48138,7 +48138,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjtouhai">
-		<description>The Mahjong Touhaiden (Jpn)</description>
+		<description>The Mahjong Touhaiden (Japan)</description>
 		<year>1993</year>
 		<publisher>Video System</publisher>
 		<info name="serial" value="SHVC-TY" />
@@ -48155,7 +48155,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="poipoitt">
-		<description>Mahou Poi Poi Poitto! (Jpn)</description>
+		<description>Mahou Poi Poi Poitto! (Japan)</description>
 		<year>1994</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-9P" />
@@ -48170,7 +48170,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="majtnseia" cloneof="majtnsei">
-		<description>Majin Tensei (Jpn, Rev. A)</description>
+		<description>Majin Tensei (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ZM" />
@@ -48188,7 +48188,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="majtnsei">
-		<description>Majin Tensei (Jpn, Rev. B)</description>
+		<description>Majin Tensei (Japan, Rev. B)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ZM" />
@@ -48206,7 +48206,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="majtnse2">
-		<description>Majin Tensei II - Spiral Nemesis (Jpn)</description>
+		<description>Majin Tensei II - Spiral Nemesis (Japan)</description>
 		<year>1995</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-AZ2J-JPN" />
@@ -48224,7 +48224,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="majuuou">
-		<description>Majuu Ou (Jpn)</description>
+		<description>Majuu Ou (Japan)</description>
 		<year>1995</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AOHJ-JPN" />
@@ -48239,7 +48239,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="makamaka">
-		<description>Maka Maka (Jpn)</description>
+		<description>Maka Maka (Japan)</description>
 		<year>1992</year>
 		<publisher>Sigma Enterprises</publisher>
 		<info name="serial" value="SHVC-MM" />
@@ -48256,7 +48256,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="makeruma" cloneof="kendo">
-		<description>Makeruna! Makendou (Jpn)</description>
+		<description>Makeruna! Makendou (Japan)</description>
 		<year>1993</year>
 		<publisher>Datam Polystar</publisher>
 		<info name="serial" value="SHVC-M7" />
@@ -48271,7 +48271,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="makerum2">
-		<description>Makeruna! Makendou 2 - Kimero! Youkai Souridaijin (Jpn)</description>
+		<description>Makeruna! Makendou 2 - Kimero! Youkai Souridaijin (Japan)</description>
 		<year>1995</year>
 		<publisher>Datam Polystar</publisher>
 		<info name="serial" value="SHVC-AM2J-JPN" />
@@ -48323,7 +48323,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mariomisf" cloneof="mariomis">
-		<description>Mario is Missing! (Fra)</description>
+		<description>Mario is Missing! (France)</description>
 		<year>1993</year>
 		<publisher>The Software Toolworks</publisher>
 		<part name="cart" interface="snes_cart">
@@ -48386,7 +48386,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mariotimg" cloneof="mariotim">
-		<description>Mario's Time Machine (Ger)</description>
+		<description>Mario's Time Machine (Germany)</description>
 		<year>1993</year>
 		<publisher>The Software Toolworks</publisher>
 		<part name="cart" interface="snes_cart">
@@ -48439,7 +48439,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="marmalad">
-		<description>Marmalade Boy (Jpn)</description>
+		<description>Marmalade Boy (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AMNJ-JPN" />
@@ -48456,7 +48456,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="marmalads" cloneof="marmalad">
-		<description>Marmalade Boy (Jpn, Sample)</description>
+		<description>Marmalade Boy (Japan, sample)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -48522,7 +48522,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="marvelou" supported="partial">
-		<description>Marvelous - Mou Hitotsu no Takarajima (Jpn)</description>
+		<description>Marvelous - Mou Hitotsu no Takarajima (Japan)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-AVRJ-JPN" />
@@ -48577,7 +48577,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="maskj" cloneof="mask">
-		<description>The Mask (Jpn)</description>
+		<description>The Mask (Japan)</description>
 		<year>1996</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AV9J-JPN" />
@@ -48617,7 +48617,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="matenden">
-		<description>Maten Densetsu - Senritsu no Ooparts (Jpn)</description>
+		<description>Maten Densetsu - Senritsu no Ooparts (Japan)</description>
 		<year>1995</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-AZ9J-JPN" />
@@ -48647,7 +48647,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="matsumur">
-		<description>Matsumura Kunihiro Den - Saikyou no Rekishi o Nurikaero! (Jpn)</description>
+		<description>Matsumura Kunihiro Den - Saikyou no Rekishi o Nurikaero! (Japan)</description>
 		<year>1994</year>
 		<publisher>Shouei System</publisher>
 		<info name="serial" value="SHVC-24" />
@@ -48719,7 +48719,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mechwarrf" cloneof="mechwarr">
-		<description>MechWarrior (Fra)</description>
+		<description>MechWarrior (France)</description>
 		<year>1993</year>
 		<publisher>Activision</publisher>
 		<part name="cart" interface="snes_cart">
@@ -48733,7 +48733,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mechwarrg" cloneof="mechwarr">
-		<description>MechWarrior (Ger)</description>
+		<description>MechWarrior (Germany)</description>
 		<year>1993</year>
 		<publisher>Activision</publisher>
 		<part name="cart" interface="snes_cart">
@@ -48747,7 +48747,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mechwarrs" cloneof="mechwarr">
-		<description>MechWarrior (Spa)</description>
+		<description>MechWarrior (Spain)</description>
 		<year>1993</year>
 		<publisher>Activision</publisher>
 		<part name="cart" interface="snes_cart">
@@ -48931,7 +48931,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="melfand">
-		<description>Melfand Stories (Jpn)</description>
+		<description>Melfand Stories (Japan)</description>
 		<year>1994</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-YZ" />
@@ -48986,7 +48986,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="metalmx2">
-		<description>Metal Max 2 (Jpn)</description>
+		<description>Metal Max 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-MX" />
@@ -49003,7 +49003,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="metalmax">
-		<description>Metal Max Returns (Jpn)</description>
+		<description>Metal Max Returns (Japan)</description>
 		<year>1995</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-AZMJ-JPN" />
@@ -49034,7 +49034,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="msladerg">
-		<description>Metal Slader Glory - Director's Cut (Jpn, NP)</description>
+		<description>Metal Slader Glory - Director's Cut (Japan, NP)</description>
 		<year>2000</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BMSJ-JPN" />
@@ -49049,7 +49049,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="andrindyj" cloneof="andrindy">
-		<description>Michael Andretti's IndyCar Challenge (Jpn)</description>
+		<description>Michael Andretti's IndyCar Challenge (Japan)</description>
 		<year>1995</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-AMAJ-JPN" />
@@ -49122,7 +49122,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mickeytd">
-		<description>Mickey no Tokyo Disneyland Daibouken (Jpn)</description>
+		<description>Mickey no Tokyo Disneyland Daibouken (Japan)</description>
 		<year>1994</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-ZJ" />
@@ -49137,7 +49137,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mickeym3">
-		<description>Mickey to Donald - Magical Adventure 3 (Jpn)</description>
+		<description>Mickey to Donald - Magical Adventure 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AM3J-JPN" />
@@ -49152,7 +49152,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mickeym2s" cloneof="mickeycm">
-		<description>Mickey to Minnie - Magical Adventure 2 (Jpn, Sample)</description>
+		<description>Mickey to Minnie - Magical Adventure 2 (Japan, sample)</description>
 		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<part name="cart" interface="snes_cart">
@@ -49203,7 +49203,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mightmg2j" cloneof="mightmg2">
-		<description>Might and Magic - Book II (Jpn)</description>
+		<description>Might and Magic - Book II (Japan)</description>
 		<year>1993</year>
 		<publisher>LOZC</publisher>
 		<info name="serial" value="SHVC-MV" />
@@ -49329,7 +49329,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mmprj" cloneof="mmpr">
-		<description>Mighty Morphin Power Rangers (Jpn)</description>
+		<description>Mighty Morphin Power Rangers (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-52" />
@@ -49407,7 +49407,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="milandra">
-		<description>Milandra (Jpn)</description>
+		<description>Milandra (Japan)</description>
 		<year>1997</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AQ9J-JPN" />
@@ -49424,7 +49424,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="miraclcp">
-		<description>Miracle Casino Paradise (Jpn)</description>
+		<description>Miracle Casino Paradise (Japan)</description>
 		<year>1995</year>
 		<publisher>Carrozzeria Japan</publisher>
 		<info name="serial" value="SHVC-ACPJ-JPN" />
@@ -49439,7 +49439,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="miracleg">
-		<description>Miracle Girls (Jpn)</description>
+		<description>Miracle Girls (Japan)</description>
 		<year>1993</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-QP" />
@@ -49454,7 +49454,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pachiss2">
-		<description>Miyaji Shachou no Pachinko Fan - Shouri Sengen 2 (Jpn)</description>
+		<description>Miyaji Shachou no Pachinko Fan - Shouri Sengen 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-AFAJ-JPN" />
@@ -49471,7 +49471,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mizuki">
-		<description>Mizuki Shigeru no Youkai Hyakkiyakou (Jpn)</description>
+		<description>Mizuki Shigeru no Youkai Hyakkiyakou (Japan)</description>
 		<year>1995</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AYHJ-JPN" />
@@ -49513,7 +49513,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="monstan">
-		<description>Monstania (Jpn)</description>
+		<description>Monstania (Japan)</description>
 		<year>1996</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-AMKJ-JPN" />
@@ -49530,7 +49530,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="monstmk3">
-		<description>Monster Maker III - Hikari no Majutsushi (Jpn)</description>
+		<description>Monster Maker III - Hikari no Majutsushi (Japan)</description>
 		<year>1993</year>
 		<publisher>Sofel</publisher>
 		<info name="serial" value="SHVC-3M" />
@@ -49547,7 +49547,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="monstmkk">
-		<description>Monster Maker Kids - Ousama ni Naritai (Jpn)</description>
+		<description>Monster Maker Kids - Ousama ni Naritai (Japan)</description>
 		<year>1994</year>
 		<publisher>Sofel</publisher>
 		<info name="serial" value="SHVC-AK2J-JPN" />
@@ -49577,7 +49577,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mkj" cloneof="mk">
-		<description>Mortal Kombat (Jpn)</description>
+		<description>Mortal Kombat (Japan)</description>
 		<year>1993</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-KX" />
@@ -49662,7 +49662,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mk2j" cloneof="mk2">
-		<description>Mortal Kombat II (Jpn)</description>
+		<description>Mortal Kombat II (Japan)</description>
 		<year>1994</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-28" />
@@ -49677,7 +49677,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="motoko">
-		<description>Motoko-chan no Wonder Kitchen (Jpn, Not for sale)</description>
+		<description>Motoko-chan no Wonder Kitchen (Japan, not for sale)</description>
 		<year>1993</year>
 		<publisher>Ajinomoto</publisher>
 		<info name="serial" value="SHVC-WK" />
@@ -49692,7 +49692,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mottekeo">
-		<description>Motteke Oh! Dorobou (Jpn)</description>
+		<description>Motteke Oh! Dorobou (Japan)</description>
 		<year>1995</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-AOEJ-JPN" />
@@ -49708,7 +49708,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mrnutzj" cloneof="mrnutz">
-		<description>Mr Nutz (Jpn)</description>
+		<description>Mr Nutz (Japan)</description>
 		<year>1994</year>
 		<publisher>Sofel</publisher>
 		<info name="serial" value="SHVC-ANUJ-JPN" />
@@ -49772,7 +49772,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mrdoj" cloneof="mrdo">
-		<description>Mr. Do! (Jpn)</description>
+		<description>Mr. Do! (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AUNJ-JPN" />
@@ -49849,7 +49849,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mujintom">
-		<description>Mujintou Monogatari (Jpn)</description>
+		<description>Mujintou Monogatari (Japan)</description>
 		<year>1996</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AK6J-JPN" />
@@ -49866,7 +49866,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mpvolley">
-		<description>Multi Play Volleyball (Jpn)</description>
+		<description>Multi Play Volleyball (Japan)</description>
 		<year>1994</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-A3VJ-JPN" />
@@ -49895,7 +49895,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mysteryc">
-		<description>Mystery Circle (Jpn)</description>
+		<description>Mystery Circle (Japan)</description>
 		<year>1992</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="SHVC-MC" />
@@ -49924,7 +49924,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mquestf" cloneof="mquest">
-		<description>Mystic Quest Legend (Fra)</description>
+		<description>Mystic Quest Legend (France)</description>
 		<year>1992</year>
 		<publisher>Square</publisher>
 		<part name="cart" interface="snes_cart">
@@ -49938,7 +49938,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nagelibr">
-		<description>Nage Libre - Seijaku no Suishin (Jpn)</description>
+		<description>Nage Libre - Seijaku no Suishin (Japan)</description>
 		<year>1995</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-ANSJ-JPN" />
@@ -49955,7 +49955,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="f1hero94">
-		<description>Nakajima Satoru Kanshuu F-1 Hero '94 (Jpn)</description>
+		<description>Nakajima Satoru Kanshuu F-1 Hero '94 (Japan)</description>
 		<year>1994</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-I5" />
@@ -49972,7 +49972,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="f1hero">
-		<description>Nakajima Satoru Kanshuu Super F-1 Hero (Jpn)</description>
+		<description>Nakajima Satoru Kanshuu Super F-1 Hero (Japan)</description>
 		<year>1992</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-S4" />
@@ -49987,7 +49987,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nakiryu">
-		<description>Naki no Ryuu - Mahjong Hishouden (Jpn)</description>
+		<description>Naki no Ryuu - Mahjong Hishouden (Japan)</description>
 		<year>1992</year>
 		<publisher>IGS</publisher>
 		<info name="serial" value="SHVC-RY" />
@@ -50004,7 +50004,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nangoku">
-		<description>Nangoku Shounen Papuwa-kun (Jpn)</description>
+		<description>Nangoku Shounen Papuwa-kun (Japan)</description>
 		<year>1994</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-N7" />
@@ -50019,7 +50019,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="natsuki">
-		<description>Natsuki Crisis Battle (Jpn)</description>
+		<description>Natsuki Crisis Battle (Japan)</description>
 		<year>1995</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-ACBJ-JPN" />
@@ -50046,7 +50046,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nbaallstj" cloneof="nbaallst">
-		<description>NBA All-Star Challenge (Jpn)</description>
+		<description>NBA All-Star Challenge (Japan)</description>
 		<year>1993</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-NB" />
@@ -50157,7 +50157,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nbajamj" cloneof="nbajam">
-		<description>NBA Jam (Jpn)</description>
+		<description>NBA Jam (Japan)</description>
 		<year>1994</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-8N" />
@@ -50198,7 +50198,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nbajamtej" cloneof="nbajamte">
-		<description>NBA Jam - Tournament Edition (Jpn)</description>
+		<description>NBA Jam - Tournament Edition (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AJTJ-JPN" />
@@ -50242,7 +50242,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nbawinnd" cloneof="nbagivgo">
-		<description>NBA Jikkyou Basket - Winning Dunk (Jpn)</description>
+		<description>NBA Jikkyou Basket - Winning Dunk (Japan)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-ANJJ-JPN" />
@@ -50260,7 +50260,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nbaliv95j" cloneof="nbaliv95">
-		<description>NBA Live 95 (Jpn)</description>
+		<description>NBA Live 95 (Japan)</description>
 		<year>1994</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-ANBJ-JPN" />
@@ -50333,7 +50333,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nbapro94" cloneof="nbashow">
-		<description>NBA Pro Basketball '94 - Bulls vs Suns (Jpn)</description>
+		<description>NBA Pro Basketball '94 - Bulls vs Suns (Japan)</description>
 		<year>1993</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-6N" />
@@ -50350,7 +50350,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nbapro" cloneof="bullvsbl">
-		<description>NBA Pro Basketball - Bulls vs Blazers (Jpn)</description>
+		<description>NBA Pro Basketball - Bulls vs Blazers (Japan)</description>
 		<year>1993</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-BU" />
@@ -50466,7 +50466,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="burnhero">
-		<description>Nekketsu Tairiku Burning Heroes (Jpn)</description>
+		<description>Nekketsu Tairiku Burning Heroes (Japan)</description>
 		<year>1995</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AEBJ-JPN" />
@@ -50495,7 +50495,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="neugier">
-		<description>Neugier - Umi to Kaze no Kodou (Jpn)</description>
+		<description>Neugier - Umi to Kaze no Kodou (Japan)</description>
 		<year>1993</year>
 		<publisher>Wolf Team</publisher>
 		<info name="serial" value="SHVC-W3" />
@@ -50512,7 +50512,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="n3dgdevis" cloneof="truewick">
-		<description>New 3D Golf Simulation - Devil's Course (Jpn, Sample)</description>
+		<description>New 3D Golf Simulation - Devil's Course (Japan, sample)</description>
 		<year>1993</year>
 		<publisher>T&amp;E Soft</publisher>
 		<part name="cart" interface="snes_cart">
@@ -50524,7 +50524,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nyatterm">
-		<description>New Yatterman - Nandai Kandai Yajirobee (Jpn)</description>
+		<description>New Yatterman - Nandai Kandai Yajirobee (Japan)</description>
 		<year>1996</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-A4YJ-JPN" />
@@ -50551,7 +50551,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="newmanhj" cloneof="newmanh">
-		<description>Newman-Haas IndyCar featuring Nigel Mansell (Jpn)</description>
+		<description>Newman-Haas IndyCar featuring Nigel Mansell (Japan)</description>
 		<year>1994</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-ANMJ-JPN" />
@@ -50592,7 +50592,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nflfootj" cloneof="nflfoot">
-		<description>NFL Football (Jpn)</description>
+		<description>NFL Football (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-NF" />
@@ -50677,7 +50677,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nflqb96j" cloneof="nflqb96">
-		<description>NFL Quarterback Club 96 (Jpn)</description>
+		<description>NFL Quarterback Club 96 (Japan)</description>
 		<year>1996</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AQBJ-JPN" />
@@ -50805,7 +50805,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nhlpro94" cloneof="nhl94">
-		<description>NHL Pro Hockey '94 (Jpn)</description>
+		<description>NHL Pro Hockey '94 (Japan)</description>
 		<year>1994</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-4H" />
@@ -50835,7 +50835,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nichiac">
-		<description>Nichibutsu Arcade Classics (Jpn)</description>
+		<description>Nichibutsu Arcade Classics (Japan)</description>
 		<year>1995</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AACJ-JPN" />
@@ -50850,7 +50850,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nichiac2">
-		<description>Nichibutsu Arcade Classics 2 - Heiankyou Alien (Jpn)</description>
+		<description>Nichibutsu Arcade Classics 2 - Heiankyou Alien (Japan)</description>
 		<year>1995</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AAEJ-JPN" />
@@ -50865,7 +50865,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nichicl1">
-		<description>Nichibutsu Collection 1 (Jpn)</description>
+		<description>Nichibutsu Collection 1 (Japan)</description>
 		<year>1996</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AECJ-JPN" />
@@ -50880,7 +50880,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mansellj" cloneof="mansell">
-		<description>Nigel Mansell F-1 Challenge (Jpn)</description>
+		<description>Nigel Mansell F-1 Challenge (Japan)</description>
 		<year>1993</year>
 		<publisher>Infocom</publisher>
 		<info name="serial" value="SHVC-NC" />
@@ -50938,7 +50938,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nryukent" cloneof="ngaidntr">
-		<description>Ninja Ryuukenden Tomoe (Jpn)</description>
+		<description>Ninja Ryuukenden Tomoe (Japan)</description>
 		<year>1995</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-ANRJ-JPN" />
@@ -50954,7 +50954,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ninjawarj" cloneof="ninjawar">
-		<description>The Ninjawarriors Again (Jpn)</description>
+		<description>The Ninjawarriors Again (Japan)</description>
 		<year>1994</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-NI" />
@@ -50982,7 +50982,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nintama">
-		<description>Nintama Rantarou (Jpn)</description>
+		<description>Nintama Rantarou (Japan)</description>
 		<year>1995</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-ANTJ-JPN" />
@@ -50997,7 +50997,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nintama2">
-		<description>Nintama Rantarou 2 (Jpn)</description>
+		<description>Nintama Rantarou 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-A2NJ-JPN" />
@@ -51012,7 +51012,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nintama3">
-		<description>Nintama Rantarou 3 (Jpn)</description>
+		<description>Nintama Rantarou 3 (Japan)</description>
 		<year>1997</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-AEXJ-JPN" />
@@ -51027,7 +51027,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nintamas">
-		<description>Nintama Rantarou Special (Jpn)</description>
+		<description>Nintama Rantarou Special (Japan)</description>
 		<year>1996</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-ANXJ-JPN" />
@@ -51042,7 +51042,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nipachi3">
-		<description>Nishijin Pachinko 3 (Jpn)</description>
+		<description>Nishijin Pachinko 3 (Japan)</description>
 		<year>1996</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AI3J-JPN" />
@@ -51057,7 +51057,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nipachi2">
-		<description>Nishijin Pachinko Monogatari 2 (Jpn)</description>
+		<description>Nishijin Pachinko Monogatari 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AN5J-JPN" />
@@ -51072,7 +51072,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nitropnk" cloneof="rockyrod">
-		<description>Nitropunks - Might Heads (Jpn)</description>
+		<description>Nitropunks - Might Heads (Japan)</description>
 		<year>1993</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="SHVC-NP" />
@@ -51146,7 +51146,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nomark">
-		<description>Nomark Baku Haitou - Shijou Saikyou no Janshi-tachi (Jpn)</description>
+		<description>Nomark Baku Haitou - Shijou Saikyou no Janshi-tachi (Japan)</description>
 		<year>1995</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-AAPJ-JPN" />
@@ -51163,7 +51163,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nontan">
-		<description>Nontan to Issho - Kurukuru Puzzle (Jpn)</description>
+		<description>Nontan to Issho - Kurukuru Puzzle (Japan)</description>
 		<year>1994</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC99" />
@@ -51178,7 +51178,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nosferatj" cloneof="nosferat">
-		<description>Nosferatu (Jpn)</description>
+		<description>Nosferatu (Japan)</description>
 		<year>1994</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-NS" />
@@ -51206,7 +51206,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="numbersp">
-		<description>Numbers Paradise (Jpn)</description>
+		<description>Numbers Paradise (Japan)</description>
 		<year>1996</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AN7J-JPN" />
@@ -51223,7 +51223,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ooekakil">
-		<description>Ou-chan no Oekaki Logic (Jpn)</description>
+		<description>Ou-chan no Oekaki Logic (Japan)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-AOUJ-JPN" />
@@ -51255,7 +51255,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="odekake" cloneof="lester">
-		<description>Odekake Lester - Lelele no Le (^^; (Jpn)</description>
+		<description>Odekake Lester - Lelele no Le (^^; (Japan)</description>
 		<year>1994</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="SHVC-07" />
@@ -51270,7 +51270,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="oekakil">
-		<description>Oekaki Logic (Jpn, NP)</description>
+		<description>Oekaki Logic (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Bunkasha Games</publisher>
 		<info name="serial" value="SHVC-BORJ-JPN" />
@@ -51287,7 +51287,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="oekakil2">
-		<description>Oekaki Logic 2 (Jpn, NP)</description>
+		<description>Oekaki Logic 2 (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Bunkasha Games</publisher>
 		<info name="serial" value="SHVC-BOSJ-JPN" />
@@ -51319,7 +51319,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="matchpg">
-		<description>Okamoto Ayako to Match Play Golf - Ko Olina Golf Club in Hawaii (Jpn)</description>
+		<description>Okamoto Ayako to Match Play Golf - Ko Olina Golf Club in Hawaii (Japan)</description>
 		<year>1994</year>
 		<publisher>Tsukuda Original</publisher>
 		<info name="serial" value="SHVC-OG" />
@@ -51336,7 +51336,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="olivia">
-		<description>Olivia no Mystery (Jpn)</description>
+		<description>Olivia no Mystery (Japan)</description>
 		<year>1994</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-ZY" />
@@ -51401,7 +51401,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="onizuka">
-		<description>Onizuka Katsuya Super Virtual Boxing - Shin Kentou Ou Densetsu (Jpn)</description>
+		<description>Onizuka Katsuya Super Virtual Boxing - Shin Kentou Ou Densetsu (Japan)</description>
 		<year>1993</year>
 		<publisher>Sofel</publisher>
 		<info name="serial" value="SHVC-OV" />
@@ -51416,7 +51416,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="oonita">
-		<description>Oonita Atsushi FMW (Jpn)</description>
+		<description>Oonita Atsushi FMW (Japan)</description>
 		<year>1993</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-OA (R98V5946)" />
@@ -51487,7 +51487,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="oragalnds" cloneof="oragalnd">
-		<description>Oraga Land Shusai - Best Farmer Shuukakusai (Jpn, Sample)</description>
+		<description>Oraga Land Shusai - Best Farmer Shuukakusai (Japan, sample)</description>
 		<year>1995</year>
 		<publisher>Vic Tokai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -51499,7 +51499,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="oragalnd">
-		<description>Oraga Land Shusai - Best Farmer Shuukakusai (Jpn)</description>
+		<description>Oraga Land Shusai - Best Farmer Shuukakusai (Japan)</description>
 		<year>1995</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="SHVC-ACUJ-JPN" />
@@ -51539,7 +51539,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="othellow">
-		<description>Othello World (Jpn)</description>
+		<description>Othello World (Japan)</description>
 		<year>1992</year>
 		<publisher>Tsukuda Original</publisher>
 		<info name="serial" value="SHVC-TO" />
@@ -51554,7 +51554,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ninjacol">
-		<description>Otoboke Ninja Colosseum (Jpn)</description>
+		<description>Otoboke Ninja Colosseum (Japan)</description>
 		<year>1995</year>
 		<publisher>Intec</publisher>
 		<info name="serial" value="SHVC-AOCJ-JPN" />
@@ -51621,7 +51621,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="outerw" cloneof="anotherw">
-		<description>Outer World (Jpn)</description>
+		<description>Outer World (Japan)</description>
 		<year>1992</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="serial" value="SHVC-TW" />
@@ -51649,7 +51649,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pmanj" cloneof="pman">
-		<description>P-Man (Jpn)</description>
+		<description>P-Man (Japan)</description>
 		<year>1995</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-APUJ-JPN" />
@@ -51746,7 +51746,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pacintimj" cloneof="pacintim">
-		<description>Pac-in-Time (Jpn)</description>
+		<description>Pac-in-Time (Japan)</description>
 		<year>1995</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-APTJ-JPN" />
@@ -51789,7 +51789,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pacman2f" cloneof="pacman2">
-		<description>Pac-Man 2 - The New Adventures (Fra)</description>
+		<description>Pac-Man 2 - The New Adventures (France)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -51802,7 +51802,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pacman2g" cloneof="pacman2">
-		<description>Pac-Man 2 - The New Adventures (Ger)</description>
+		<description>Pac-Man 2 - The New Adventures (Germany)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -51828,7 +51828,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pslotgam">
-		<description>Pachi-Slot Gambler (Jpn)</description>
+		<description>Pachi-Slot Gambler (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AGAJ-JPN" />
@@ -51845,7 +51845,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pslotkzn">
-		<description>Pachi-Slot Kanzen Kouryaku - Universal Shindai Nyuuka Volume 1 (Jpn)</description>
+		<description>Pachi-Slot Kanzen Kouryaku - Universal Shindai Nyuuka Volume 1 (Japan)</description>
 		<year>1997</year>
 		<publisher>Syscom Entertainment</publisher>
 		<info name="serial" value="SHVC-AUYJ-JPN" />
@@ -51862,7 +51862,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pslotken">
-		<description>Pachi-Slot Kenkyuu (Jpn)</description>
+		<description>Pachi-Slot Kenkyuu (Japan)</description>
 		<year>1994</year>
 		<publisher>Magical</publisher>
 		<info name="serial" value="SHVC-77" />
@@ -51877,7 +51877,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pslotlnd">
-		<description>Pachi-Slot Land - Pachipachi Coin no Densetsu (Jpn)</description>
+		<description>Pachi-Slot Land - Pachipachi Coin no Densetsu (Japan)</description>
 		<year>1994</year>
 		<publisher>Carrozzeria Japan</publisher>
 		<info name="serial" value="SHVC-7P" />
@@ -51892,7 +51892,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pslotmp">
-		<description>Pachi-Slot Monogatari - PAL Kougyou Special (Jpn)</description>
+		<description>Pachi-Slot Monogatari - PAL Kougyou Special (Japan)</description>
 		<year>1995</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-A2WJ-JPN" />
@@ -51908,7 +51908,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pachichl">
-		<description>Pachinko Challenger V (Jpn)</description>
+		<description>Pachinko Challenger V (Japan)</description>
 		<year>1995</year>
 		<publisher>Carrozzeria Japan</publisher>
 		<info name="serial" value="SHVC-APVJ-JPN" />
@@ -51923,7 +51923,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pachifan">
-		<description>Pachinko Fan - Shouri Sengen (Jpn)</description>
+		<description>Pachinko Fan - Shouri Sengen (Japan)</description>
 		<year>1994</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-APSJ-JPN" />
@@ -51940,7 +51940,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pachimar">
-		<description>Pachinko Maruhi Hisshouhou (Jpn)</description>
+		<description>Pachinko Maruhi Hisshouhou (Japan)</description>
 		<year>1994</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-APKJ-JPN" />
@@ -51955,7 +51955,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pachiren">
-		<description>Pachinko Ren-chan Tengoku - Super CR Special (Jpn)</description>
+		<description>Pachinko Ren-chan Tengoku - Super CR Special (Japan)</description>
 		<year>1995</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-ALCJ-JPN" />
@@ -51970,7 +51970,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pachitet">
-		<description>Pachinko Tetsujin - Nanaban Shoubu (Jpn, Not for sale)</description>
+		<description>Pachinko Tetsujin - Nanaban Shoubu (Japan, not for sale)</description>
 		<year>1995</year>
 		<publisher>Daikoku</publisher>
 		<info name="serial" value="SHVC-A77J-JPN" />
@@ -51986,7 +51986,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pachikn3">
-		<description>Pachio-kun Special 3 (Jpn)</description>
+		<description>Pachio-kun Special 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-AP3J-JPN" />
@@ -52041,7 +52041,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="panicnak">
-		<description>Panic in Nakayoshi World (Jpn)</description>
+		<description>Panic in Nakayoshi World (Japan)</description>
 		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-ANAJ-JPN" />
@@ -52069,7 +52069,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="paramev1">
-		<description>Parame ROM Cassette Vol. 1 (Jpn)</description>
+		<description>Parame ROM Cassette Vol. 1 (Japan)</description>
 		<year>199?</year>
 		<publisher>Gametech</publisher>
 		<info name="alt_title" value="ぱらめROMカセット VOL. 1" />
@@ -52082,7 +52082,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="paramev2">
-		<description>Parame ROM Cassette 2 Gō (Jpn)</description>
+		<description>Parame ROM Cassette 2 Gō (Japan)</description>
 		<year>199?</year>
 		<publisher>Gametech</publisher>
 		<info name="alt_title" value="ぱらめROMカセット2号" />
@@ -52095,7 +52095,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="paramev3">
-		<description>Parame ROM Cassette 3 Gō (Jpn)</description>
+		<description>Parame ROM Cassette 3 Gō (Japan)</description>
 		<year>199?</year>
 		<publisher>Gametech</publisher>
 		<info name="alt_title" value="ぱらめROMカセット3号" />
@@ -52108,7 +52108,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="parlminia" cloneof="parlmini">
-		<description>Parlor! Mini - Pachinko Jikki Simulation Game (Jpn)</description>
+		<description>Parlor! Mini - Pachinko Jikki Simulation Game (Japan)</description>
 		<year>1996</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQAJ-JPN" />
@@ -52123,7 +52123,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="parlmin3">
-		<description>Parlor! Mini 3 - Pachinko Jikki Simulation Game (Jpn)</description>
+		<description>Parlor! Mini 3 - Pachinko Jikki Simulation Game (Japan)</description>
 		<year>1996</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQVJ-JPN" />
@@ -52138,7 +52138,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="parlmin5">
-		<description>Parlor! Mini 5 - Pachinko Jikki Simulation Game (Jpn)</description>
+		<description>Parlor! Mini 5 - Pachinko Jikki Simulation Game (Japan)</description>
 		<year>1997</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AQYJ-JPN" />
@@ -52154,7 +52154,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="parlpar2">
 		<!-- Alt. Title: 京楽 三洋 豊丸 大一 マルホン Parlor ! パーラー!2 / Kyouraku - Sanyo - Toyomaru - Daiichi - Maruhon - Parlor! Parlor! 2 (Box) -->
-		<description>Parlor! Parlor! 2 (Jpn)</description>
+		<description>Parlor! Parlor! 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AIPJ-JPN" />
@@ -52172,7 +52172,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="parlpar5">
 		<!-- Alt. Title: 京楽 三洋 マルホン Parlor ! パーラー! 5 ~ Kyouraku - Sanyou - Maruhon - Parlor! Parlor! 5 (Box) -->
-		<description>Parlor! Parlor! 5 (Jpn)</description>
+		<description>Parlor! Parlor! 5 (Japan)</description>
 		<year>1996</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="release" value="19960329" />
@@ -52189,7 +52189,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="parlpar4">
 		<!-- Alt. Title: 京楽 三洋 豊丸 奥村 大一 マルホン Parlor ! パーラー!IV CR / Kyouraku - Sanyou - Toyomaru - Okumura - Daiichi - Maruhon - Parlor! Parlor! IV CR (Box) -->
-		<description>Parlor! Parlor! IV CR (Jpn)</description>
+		<description>Parlor! Parlor! IV CR (Japan)</description>
 		<year>1995</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-AZCJ-JPN" />
@@ -52295,7 +52295,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pgaj" cloneof="pga">
-		<description>PGA Tour Golf (Jpn)</description>
+		<description>PGA Tour Golf (Japan)</description>
 		<year>1992</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-PG" />
@@ -52355,7 +52355,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="phalanxj" cloneof="phalanx">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Phalanx - The Enforce Fighter A-144 (Jpn)</description>
+		<description>Phalanx - The Enforce Fighter A-144 (Japan)</description>
 		<year>1992</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-PH" />
@@ -52434,7 +52434,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv1">
-		<description>Picross NP Vol. 1 (Jpn, Rev. A, NP)</description>
+		<description>Picross NP Vol. 1 (Japan, Rev. A, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BPIJ-JPN" />
@@ -52451,7 +52451,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv1a" cloneof="picrosv1">
-		<description>Picross NP Vol. 1 (Jpn, NP)</description>
+		<description>Picross NP Vol. 1 (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BPIJ-JPN" />
@@ -52468,7 +52468,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv2a" cloneof="picrosv2">
-		<description>Picross NP Vol. 2 (Jpn, NP)</description>
+		<description>Picross NP Vol. 2 (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP2J-JPN" />
@@ -52485,7 +52485,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv2">
-		<description>Picross NP Vol. 2 (Jpn, Rev. A, NP)</description>
+		<description>Picross NP Vol. 2 (Japan, Rev. A, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP2J-JPN" />
@@ -52502,7 +52502,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv3">
-		<description>Picross NP Vol. 3 (Jpn, NP)</description>
+		<description>Picross NP Vol. 3 (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP3J-JPN" />
@@ -52519,7 +52519,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv4">
-		<description>Picross NP Vol. 4 (Jpn, Rev. A, NP)</description>
+		<description>Picross NP Vol. 4 (Japan, Rev. A, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP4J-JPN" />
@@ -52536,7 +52536,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv4a" cloneof="picrosv4">
-		<description>Picross NP Vol. 4 (Jpn, NP)</description>
+		<description>Picross NP Vol. 4 (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP4J-JPN" />
@@ -52553,7 +52553,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv5">
-		<description>Picross NP Vol. 5 (Jpn, NP)</description>
+		<description>Picross NP Vol. 5 (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP5J-JPN" />
@@ -52570,7 +52570,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv6">
-		<description>Picross NP Vol. 6 (Jpn, NP)</description>
+		<description>Picross NP Vol. 6 (Japan, NP)</description>
 		<year>2000</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP6J-JPN" />
@@ -52587,7 +52587,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv7">
-		<description>Picross NP Vol. 7 (Jpn, NP)</description>
+		<description>Picross NP Vol. 7 (Japan, NP)</description>
 		<year>2000</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP7J-JPN" />
@@ -52604,7 +52604,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="picrosv8">
-		<description>Picross NP Vol. 8 (Jpn, NP)</description>
+		<description>Picross NP Vol. 8 (Japan, NP)</description>
 		<year>2000</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BP8J-JPN" />
@@ -52634,7 +52634,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pikiinya">
-		<description>Pikiinya! (Jpn)</description>
+		<description>Pikiinya! (Japan)</description>
 		<year>1997</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-A9AJ-JPN" />
@@ -52715,7 +52715,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pbpinbal" cloneof="pbdreams">
-		<description>Pinball Pinball (Jpn)</description>
+		<description>Pinball Pinball (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-7D" />
@@ -52743,7 +52743,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pinkj" cloneof="pink">
-		<description>Pink Panther (Jpn)</description>
+		<description>Pink Panther (Japan)</description>
 		<year>1994</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-YW" />
@@ -52782,7 +52782,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pinocj" cloneof="pinoc">
-		<description>Pinocchio (Jpn)</description>
+		<description>Pinocchio (Japan)</description>
 		<year>1996</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-ACGJ-JPN" />
@@ -52812,7 +52812,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pipedrem">
-		<description>Pipe Dream (Jpn)</description>
+		<description>Pipe Dream (Japan)</description>
 		<year>1992</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-PP" />
@@ -52865,7 +52865,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pitfallj" cloneof="pitfall">
-		<description>Pitfall - The Mayan Adventure (Jpn)</description>
+		<description>Pitfall - The Mayan Adventure (Japan)</description>
 		<year>1995</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-APAJ (PCPE-00500)" />
@@ -52905,7 +52905,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tg3kj" cloneof="tg3k">
-		<description>The Planet's Champ TG 3000 (Jpn)</description>
+		<description>The Planet's Champ TG 3000 (Japan)</description>
 		<year>1995</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-A3TJ-JPN" />
@@ -52937,7 +52937,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="plokj" cloneof="plok">
-		<description>Plok! (Jpn)</description>
+		<description>Plok! (Japan)</description>
 		<year>1993</year>
 		<publisher>Activision</publisher>
 		<info name="serial" value="SHVC-P4" />
@@ -52967,7 +52967,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pockys" cloneof="pocky">
-		<description>Pocky &amp; Rocky (Euro, Sample)</description>
+		<description>Pocky &amp; Rocky (Euro, sample)</description>
 		<year>1993</year>
 		<publisher>Natsume</publisher>
 		<part name="cart" interface="snes_cart">
@@ -53028,7 +53028,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pokonyan">
-		<description>Pokonyan! - Henpokorin Adventure (Jpn)</description>
+		<description>Pokonyan! - Henpokorin Adventure (Japan)</description>
 		<year>1994</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="SHVC-APOJ-JPN" />
@@ -53069,7 +53069,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="twinbadvg" cloneof="twinbadv">
-		<description>Pop'n TwinBee - Rainbow Bell Adventures (Ger)</description>
+		<description>Pop'n TwinBee - Rainbow Bell Adventures (Germany)</description>
 		<year>1995</year>
 		<publisher>Konami</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -53082,7 +53082,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="popeye">
-		<description>Popeye - Ijiwaru Majo Sea Hag no Maki (Jpn)</description>
+		<description>Popeye - Ijiwaru Majo Sea Hag no Maki (Japan)</description>
 		<year>1994</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-XI" />
@@ -53099,7 +53099,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="popmail">
-		<description>Popful Mail (Jpn)</description>
+		<description>Popful Mail (Japan)</description>
 		<year>1994</year>
 		<publisher>Nihon Falcom</publisher>
 		<info name="serial" value="SHVC-IW" />
@@ -53117,7 +53117,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="popoitto" cloneof="hebepopt">
-		<description>Popoitto Hebereke (Jpn)</description>
+		<description>Popoitto Hebereke (Japan)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-APHJ-JPN" />
@@ -53171,7 +53171,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="populus2g" cloneof="populus2">
-		<description>Populous II - Trials of the Olympian Gods (Ger)</description>
+		<description>Populous II - Trials of the Olympian Gods (Germany)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -53220,7 +53220,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="powerath" cloneof="powermov">
-		<description>Power Athlete (Jpn)</description>
+		<description>Power Athlete (Japan)</description>
 		<year>1992</year>
 		<publisher>Kaneko</publisher>
 		<info name="serial" value="SHVC-P3" />
@@ -53272,7 +53272,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="powerlod">
-		<description>Power Lode Runner (Jpn, NP)</description>
+		<description>Power Lode Runner (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BPLJ-JPN" />
@@ -53468,7 +53468,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="prinmak">
-		<description>Princess Maker - Legend of Another World (Jpn)</description>
+		<description>Princess Maker - Legend of Another World (Japan)</description>
 		<year>1995</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-AOIJ-JPN" />
@@ -53485,7 +53485,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="pminerva">
-		<description>Princess Minerva (Jpn)</description>
+		<description>Princess Minerva (Japan)</description>
 		<year>1995</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="SHVC-AVAJ-JPN" />
@@ -53502,7 +53502,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="profot93" cloneof="madden93">
-		<description>Pro Football '93 (Jpn)</description>
+		<description>Pro Football '93 (Japan)</description>
 		<year>1993</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-JM" />
@@ -53517,7 +53517,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="prokishi">
-		<description>Pro Kishi Jinsei Simulation - Shougi no Hanamichi (Jpn)</description>
+		<description>Pro Kishi Jinsei Simulation - Shougi no Hanamichi (Japan)</description>
 		<year>1996</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-AARJ-JPN" />
@@ -53535,7 +53535,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjkiwam2">
-		<description>Pro Mahjong Kiwame II (Jpn, Rev. A)</description>
+		<description>Pro Mahjong Kiwame II (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-K9" />
@@ -53552,7 +53552,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjkiwam2a" cloneof="mjkiwam2">
-		<description>Pro Mahjong Kiwame II (Jpn)</description>
+		<description>Pro Mahjong Kiwame II (Japan)</description>
 		<year>1994</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-K9" />
@@ -53569,7 +53569,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjtsuwar" cloneof="mjtsuwa">
-		<description>Pro Mahjong Tsuwamono Renkaban (Jpn)</description>
+		<description>Pro Mahjong Tsuwamono Renkaban (Japan)</description>
 		<year>1998</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-AQ2J-JPN" />
@@ -53584,7 +53584,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="mjtsuwa">
-		<description>Pro Mahjong Tsuwamono (Jpn)</description>
+		<description>Pro Mahjong Tsuwamono (Japan)</description>
 		<year>1997</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-AQZJ-JPN" />
@@ -53630,7 +53630,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="proyakpzp" cloneof="proyakpz">
-		<description>Pro Yakyuu Nettou Puzzle Stadium (Jpn, prototype)</description>
+		<description>Pro Yakyuu Nettou Puzzle Stadium (Japan, prototype)</description>
 		<year>1997</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<part name="cart" interface="snes_cart">
@@ -53644,7 +53644,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="proyakpz">
-		<description>Pro Yakyuu Nettou Puzzle Stadium (Jpn)</description>
+		<description>Pro Yakyuu Nettou Puzzle Stadium (Japan)</description>
 		<year>1997</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-A97J-JPN" />
@@ -53696,7 +53696,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="puttmoon" cloneof="suprputt">
-		<description>Putty Moon (Jpn)</description>
+		<description>Putty Moon (Japan)</description>
 		<year>1993</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-PU" />
@@ -53748,7 +53748,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="puzlnint">
-		<description>Puzzle Nintama Rantarou - Ninjutsu Gakuen Puzzle Taikai no Dan (Jpn)</description>
+		<description>Puzzle Nintama Rantarou - Ninjutsu Gakuen Puzzle Taikai no Dan (Japan)</description>
 		<year>1996</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-ANVJ-JPN" />
@@ -53763,7 +53763,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="puzldesu">
-		<description>Puzzle'n Desu! (Jpn)</description>
+		<description>Puzzle'n Desu! (Japan)</description>
 		<year>1995</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-ASUJ-JPN" />
@@ -53780,7 +53780,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="qbert3j" cloneof="qbert3">
-		<description>Q*bert 3 (Jpn)</description>
+		<description>Q*bert 3 (Japan)</description>
 		<year>1993</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-Q3" />
@@ -53821,7 +53821,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="rtype3j" cloneof="rtype3">
-		<description>R-Type III - The Third Lightning (Jpn)</description>
+		<description>R-Type III - The Third Lightning (Japan)</description>
 		<year>1993</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="SHVC-ER" />
@@ -53874,7 +53874,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="rpmj" cloneof="rpm">
-		<description>Radical Psycho Machine Racing (Jpn)</description>
+		<description>Radical Psycho Machine Racing (Japan)</description>
 		<year>1992</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="serial" value="SHVC-V3" />
@@ -53930,7 +53930,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="raidenj" cloneof="raiden">
-		<description>Raiden Densetsu (Jpn)</description>
+		<description>Raiden Densetsu (Japan)</description>
 		<year>1991</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="SHVC-RD" />
@@ -53958,7 +53958,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ramosruy" cloneof="worldsoc">
-		<description>Ramos Ruy no World Wide Soccer (Jpn)</description>
+		<description>Ramos Ruy no World Wide Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-6K" />
@@ -54039,7 +54039,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ranmaaka">
-		<description>Ranma ½ - Akanekodan Teki Hihou (Jpn)</description>
+		<description>Ranma ½ - Akanekodan Teki Hihou (Japan)</description>
 		<year>1993</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="SHVC-R4" />
@@ -54056,7 +54056,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ranmaran">
-		<description>Ranma ½ - Chougi Ranbu Hen (Jpn)</description>
+		<description>Ranma ½ - Chougi Ranbu Hen (Japan)</description>
 		<year>1994</year>
 		<publisher>Shogakukan Production</publisher>
 		<info name="serial" value="SHVC-5K" />
@@ -54084,7 +54084,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ranmajan">
-		<description>Ranma ½ - Ougi Jaanken (Jpn)</description>
+		<description>Ranma ½ - Ougi Jaanken (Japan)</description>
 		<year>1995</year>
 		<publisher>Shogakukan Production</publisher>
 		<info name="serial" value="SHVC-ARPJ-JPN" />
@@ -54175,7 +54175,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="rejoice">
-		<description>Rejoice - Aretha Oukoku no Kanata (Jpn)</description>
+		<description>Rejoice - Aretha Oukoku no Kanata (Japan)</description>
 		<year>1995</year>
 		<publisher>Yanoman Games</publisher>
 		<info name="serial" value="SHVC-AYRJ-JPN" />
@@ -54268,7 +54268,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="rrr2">
-		<description>Rendering Ranger R2 (Jpn)</description>
+		<description>Rendering Ranger R2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AVCJ-JPN" />
@@ -54295,7 +54295,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="returndd" cloneof="sddragon">
-		<description>Return of Double Dragon (Jpn)</description>
+		<description>Return of Double Dragon (Japan)</description>
 		<year>1992</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-WD" />
@@ -54335,7 +54335,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="revxg" cloneof="revx">
-		<description>Revolution X (Ger)</description>
+		<description>Revolution X (Germany)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -54348,7 +54348,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="revxj" cloneof="revx">
-		<description>Revolution X (Jpn)</description>
+		<description>Revolution X (Japan)</description>
 		<year>1996</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AXRJ-JPN" />
@@ -54391,7 +54391,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="riddickj" cloneof="riddick">
-		<description>Riddick Bowe Boxing (Jpn)</description>
+		<description>Riddick Bowe Boxing (Japan)</description>
 		<year>1993</year>
 		<publisher>Micronet</publisher>
 		<info name="serial" value="SHVC-XG" />
@@ -54423,7 +54423,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="rinkaiho">
-		<description>Rin Kaihou Kudan no Igo Taidou (Jpn)</description>
+		<description>Rin Kaihou Kudan no Igo Taidou (Japan)</description>
 		<year>1996</year>
 		<publisher>ASK Kodansha</publisher>
 		<info name="serial" value="SHVC-AIDJ-JPN" />
@@ -54441,7 +54441,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ringkake">
-		<description>Ring ni Kakero (Jpn, NP)</description>
+		<description>Ring ni Kakero (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>NCS</publisher>
 		<info name="serial" value="SHVC-ARKJ-JPN" />
@@ -54483,7 +54483,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="riseroboj" cloneof="riserobo">
-		<description>Rise of the Robots (Jpn)</description>
+		<description>Rise of the Robots (Japan)</description>
 		<year>1994</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-AROJ-JPN" />
@@ -54634,7 +54634,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="rockmnx" cloneof="megamnx">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Rockman X (Jpn, Rev. A)</description>
+		<description>Rockman X (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-RX" />
@@ -54729,7 +54729,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="romsaga3s" cloneof="romsaga3">
-		<description>Romancing Sa-Ga 3 Trial Sample ROM (Jpn, Not for sale)</description>
+		<description>Romancing Sa-Ga 3 Trial Sample ROM (Japan, not for sale)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-AL9J-JPN" />
@@ -54744,7 +54744,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="royalcnq" cloneof="kingartw">
-		<description>Royal Conquest (Jpn)</description>
+		<description>Royal Conquest (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-RC" />
@@ -54759,7 +54759,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ruinarm">
-		<description>Ruin Arm (Jpn)</description>
+		<description>Ruin Arm (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AINJ-JPN" />
@@ -54788,7 +54788,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="rushbetr" cloneof="brawlbro">
-		<description>Rushing Beat Ran - Fukusei Toshi (Jpn)</description>
+		<description>Rushing Beat Ran - Fukusei Toshi (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-RE" />
@@ -54803,7 +54803,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="rushbets" cloneof="peacekep">
-		<description>Rushing Beat Shura (Jpn)</description>
+		<description>Rushing Beat Shura (Japan)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-R6" />
@@ -54819,7 +54819,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="danzarb">
-		<description>Ryuuki Heidan Danzarb (Jpn)</description>
+		<description>Ryuuki Heidan Danzarb (Japan)</description>
 		<year>1993</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-DA" />
@@ -54836,7 +54836,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ryukoken" cloneof="aof">
-		<description>Ryuuko no Ken (Jpn, Rev. A)</description>
+		<description>Ryuuko no Ken (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="SHVC-RW" />
@@ -54852,7 +54852,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ryukokn2">
-		<description>Ryuuko no Ken 2 (Jpn)</description>
+		<description>Ryuuko no Ken 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Saurus</publisher>
 		<info name="serial" value="SHVC-AAFJ-JPN" />
@@ -54868,7 +54868,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="saibarmj">
-		<description>Saibara Rieko no Mahjong Hourouki (Jpn)</description>
+		<description>Saibara Rieko no Mahjong Hourouki (Japan)</description>
 		<year>1995</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-AJNJ-JPN" />
@@ -54885,7 +54885,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="saikouso">
-		<description>Saikousoku Shikou Shougi Mahjong (Jpn)</description>
+		<description>Saikousoku Shikou Shougi Mahjong (Japan)</description>
 		<year>1995</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-ASYJ-JPN" />
@@ -54903,7 +54903,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="saikyou">
-		<description>Saikyou - Takada Nobuhiko (Jpn)</description>
+		<description>Saikyou - Takada Nobuhiko (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AS7J-JPN" />
@@ -54918,7 +54918,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sailormnf" cloneof="sailormn">
-		<description>Sailormoon (Fra)</description>
+		<description>Sailormoon (France)</description>
 		<year>1993</year>
 		<publisher>Angel</publisher>
 		<part name="cart" interface="snes_cart">
@@ -54930,7 +54930,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="samsarn2">
-		<description>Samsara Naga 2 (Jpn)</description>
+		<description>Samsara Naga 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-IV" />
@@ -54961,7 +54961,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="samspirp" cloneof="samsho">
-		<description>Samurai Spirits (Jpn, prototype)</description>
+		<description>Samurai Spirits (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Takara</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
@@ -54974,7 +54974,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sangoeik">
-		<description>Sangokushi - Eiketsuden (Jpn)</description>
+		<description>Sangokushi - Eiketsuden (Japan)</description>
 		<year>1995</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-A3AJ-JPN" />
@@ -55005,7 +55005,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sangoku3" cloneof="roman3k3">
-		<description>Sangokushi III (Jpn, Rev. A)</description>
+		<description>Sangokushi III (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-S3" />
@@ -55022,7 +55022,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sangoku4" cloneof="roman3k4">
-		<description>Sangokushi IV (Jpn, Rev. A)</description>
+		<description>Sangokushi IV (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AS4J-JPN" />
@@ -55039,7 +55039,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sangosei">
-		<description>Sangokushi Seishi - Tenbu Spirits (Jpn)</description>
+		<description>Sangokushi Seishi - Tenbu Spirits (Japan)</description>
 		<year>1993</year>
 		<publisher>Wolf Team</publisher>
 		<info name="serial" value="SHVC-W2" />
@@ -55056,7 +55056,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sanriosh">
-		<description>Sanrio Shanghai (Jpn)</description>
+		<description>Sanrio Shanghai (Japan)</description>
 		<year>1994</year>
 		<publisher>Character Soft</publisher>
 		<info name="serial" value="SHVC-38" />
@@ -55071,7 +55071,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="smashbal">
-		<description>Sanrio World Smash Ball! (Jpn)</description>
+		<description>Sanrio World Smash Ball! (Japan)</description>
 		<year>1993</year>
 		<publisher>Character Soft</publisher>
 		<info name="serial" value="SHVC-S7" />
@@ -55086,7 +55086,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdf1gp">
-		<description>SD F-1 Grand Prix (Jpn)</description>
+		<description>SD F-1 Grand Prix (Japan)</description>
 		<year>1995</year>
 		<publisher>Video System</publisher>
 		<info name="serial" value="SHVC-AGFJ-JPN" />
@@ -55104,7 +55104,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdgunpzl">
-		<description>SD Gundam - Power Formation Puzzle (Jpn)</description>
+		<description>SD Gundam - Power Formation Puzzle (Japan)</description>
 		<year>1996</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AXXJ-JPN" />
@@ -55119,7 +55119,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="kgundam">
-		<description>SD Gundam Gaiden - Knight Gundam Monogatari - Ooinaru Isan (Jpn, Rev. A)</description>
+		<description>SD Gundam Gaiden - Knight Gundam Monogatari - Ooinaru Isan (Japan, Rev. A)</description>
 		<year>1991</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-KG" />
@@ -55136,7 +55136,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdgundg2">
-		<description>SD Gundam Gaiden 2 - Entaku no Kishi (Jpn)</description>
+		<description>SD Gundam Gaiden 2 - Entaku no Kishi (Japan)</description>
 		<year>1992</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-EN" />
@@ -55153,7 +55153,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdgund2">
-		<description>SD Kidou Senshi Gundam 2 (Jpn)</description>
+		<description>SD Kidou Senshi Gundam 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-ZG" />
@@ -55194,7 +55194,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="evermores" cloneof="evermore">
-		<description>Secret of Evermore (Spa)</description>
+		<description>Secret of Evermore (Spain)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -55238,7 +55238,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="manafa" cloneof="mana">
-		<description>Secret of Mana (Fra)</description>
+		<description>Secret of Mana (France)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -55253,7 +55253,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="prettyfg">
-		<description>Seifuku Densetsu Pretty Fighter (Jpn)</description>
+		<description>Seifuku Densetsu Pretty Fighter (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-ASFJ-JPN" />
@@ -55268,7 +55268,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="seijuuma">
-		<description>Seijuu Maden Beasts &amp; Blades (Jpn)</description>
+		<description>Seijuu Maden Beasts &amp; Blades (Japan)</description>
 		<year>1995</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-AB5J-JPN" />
@@ -55286,7 +55286,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="seikndn3s" cloneof="seikndn3">
-		<description>Seiken Densetsu 3 Trial Sample ROM (Jpn, Not for sale)</description>
+		<description>Seiken Densetsu 3 Trial Sample ROM (Japan, not for sale)</description>
 		<year>1995</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SHVC-A3EJ-JPN" />
@@ -55302,7 +55302,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sengoku">
-		<description>Sengoku Denshou (Jpn)</description>
+		<description>Sengoku Denshou (Japan)</description>
 		<year>1993</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-G5" />
@@ -55318,7 +55318,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sengohas">
-		<description>Sengoku no Hasha - Tenkafubu e no Michi (Jpn)</description>
+		<description>Sengoku no Hasha - Tenkafubu e no Michi (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A8AJ-JPN" />
@@ -55349,7 +55349,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="septentr" cloneof="sos">
-		<description>Septentrion (Jpn)</description>
+		<description>Septentrion (Japan)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-TT" />
@@ -55364,7 +55364,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="serizawa" cloneof="mecarobo">
-		<description>Serizawa Nobuo no Birdie Try (Jpn)</description>
+		<description>Serizawa Nobuo no Birdie Try (Japan)</description>
 		<year>1992</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="SHVC-TS" />
@@ -55381,7 +55381,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgtsaund">
-		<description>Sgt. Saunders' Combat! (Jpn)</description>
+		<description>Sgt. Saunders' Combat! (Japan)</description>
 		<year>1995</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AJAJ-JPN" />
@@ -55412,7 +55412,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shadowrng" cloneof="shadowrn">
-		<description>Shadowrun (Ger)</description>
+		<description>Shadowrun (Germany)</description>
 		<year>1993</year>
 		<publisher>Data East</publisher>
 		<part name="cart" interface="snes_cart">
@@ -55426,7 +55426,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shadowrnj" cloneof="shadowrn">
-		<description>Shadowrun (Jpn)</description>
+		<description>Shadowrun (Japan)</description>
 		<year>1994</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-WR" />
@@ -55443,7 +55443,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shadowrnsw" cloneof="shadowrn">
-		<description>Shadowrun (Swe)</description>
+		<description>Shadowrun (Sweden)</description>
 		<year>1993</year>
 		<publisher>Data East</publisher>
 		<part name="cart" interface="snes_cart">
@@ -55500,7 +55500,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shadowrns" cloneof="shadowrn">
-		<description>Shadowrun (Euro, Sample)</description>
+		<description>Shadowrun (Euro, sample)</description>
 		<year>1993</year>
 		<publisher>Data East</publisher>
 		<part name="cart" interface="snes_cart">
@@ -55514,7 +55514,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shangbana" cloneof="shangban">
-		<description>Shanghai - Banri no Choujou (Jpn)</description>
+		<description>Shanghai - Banri no Choujou (Japan)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-A4SJ-JPN" />
@@ -55566,7 +55566,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shichusu">
-		<description>Shichuusuimeigaku Nyuumon - Shin Tougenkyou (Jpn)</description>
+		<description>Shichuusuimeigaku Nyuumon - Shin Tougenkyou (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AP8J-JPN" />
@@ -55581,7 +55581,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shienj" cloneof="shien">
-		<description>Shien - The Blade Chaser (Jpn)</description>
+		<description>Shien - The Blade Chaser (Japan)</description>
 		<year>1994</year>
 		<publisher>Dynamic Planning</publisher>
 		<info name="serial" value="SHVC-OO" />
@@ -55622,7 +55622,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="seriea">
-		<description>Shijou Saikyou League Serie A - Ace Striker (Jpn)</description>
+		<description>Shijou Saikyou League Serie A - Ace Striker (Japan)</description>
 		<year>1995</year>
 		<publisher>TNN</publisher>
 		<info name="serial" value="SHVC-ATXJ-JPN" />
@@ -55639,7 +55639,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shijoqz">
-		<description>Shijou Saikyou no Quiz Ou Ketteisen Super (Jpn)</description>
+		<description>Shijou Saikyou no Quiz Ou Ketteisen Super (Japan)</description>
 		<year>1992</year>
 		<publisher>Party Room 21</publisher>
 		<info name="serial" value="SHVC-QS" />
@@ -55656,7 +55656,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="jinryu">
-		<description>Shiki Eiyuu Den - Jinryuu Densetsu (Jpn)</description>
+		<description>Shiki Eiyuu Den - Jinryuu Densetsu (Japan)</description>
 		<year>1995</year>
 		<publisher>Outrigger</publisher>
 		<info name="serial" value="SHVC-AAUJ-JPN" />
@@ -55673,7 +55673,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shimono">
-		<description>Shimono Masaki no Fishing to Bassing (Jpn)</description>
+		<description>Shimono Masaki no Fishing to Bassing (Japan)</description>
 		<year>1994</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="SHVC-ABIJ-JPN" />
@@ -55690,7 +55690,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinikka">
-		<description>Shin Ikkakusenkin (Jpn)</description>
+		<description>Shin Ikkakusenkin (Japan)</description>
 		<year>1995</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-AI2J-JPN" />
@@ -55705,7 +55705,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="gndmwend">
-		<description>Shin Kidou Senki Gundam W - Endless Duel (Jpn)</description>
+		<description>Shin Kidou Senki Gundam W - Endless Duel (Japan)</description>
 		<year>1996</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AEDJ-JPN" />
@@ -55721,7 +55721,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="shinmt">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Shin Megami Tensei (Jpn, Rev. A)</description>
+		<description>Shin Megami Tensei (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ME" />
@@ -55739,7 +55739,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 <!-- Can we consider this board confirmed? -->
 	<software name="shinmt2a" cloneof="shinmt2">
-		<description>Shin Megami Tensei II (Jpn, Rev. A)</description>
+		<description>Shin Megami Tensei II (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="SHVC-ZE-1" />
@@ -55765,7 +55765,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinnekk">
-		<description>Shin Nekketsu Kouha - Kunio-tachi no Banka (Jpn)</description>
+		<description>Shin Nekketsu Kouha - Kunio-tachi no Banka (Japan)</description>
 		<year>1994</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-QN" />
@@ -55780,7 +55780,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sprowres">
-		<description>Shin Nihon Pro Wrestling - Chou Senshi in Tokyo Dome - Fantastic Story (Jpn)</description>
+		<description>Shin Nihon Pro Wrestling - Chou Senshi in Tokyo Dome - Fantastic Story (Japan)</description>
 		<year>1993</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-NJ" />
@@ -55795,7 +55795,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sprowr94">
-		<description>Shin Nihon Pro Wrestling Kounin - '94 Battlefield in Tokyo Dome (Jpn)</description>
+		<description>Shin Nihon Pro Wrestling Kounin - '94 Battlefield in Tokyo Dome (Japan)</description>
 		<year>1994</year>
 		<publisher>Varie</publisher>
 		<info name="release" value="19940812" />
@@ -55809,7 +55809,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sprowr95">
-		<description>Shin Nihon Pro Wrestling Kounin - '95 Tokyo Dome Battle 7 (Jpn)</description>
+		<description>Shin Nihon Pro Wrestling Kounin - '95 Tokyo Dome Battle 7 (Japan)</description>
 		<year>1995</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-AB7J-JPN" />
@@ -55824,7 +55824,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinseng">
-		<description>Shin SD Sengokuden - Daishougun Retsuden (Jpn)</description>
+		<description>Shin SD Sengokuden - Daishougun Retsuden (Japan)</description>
 		<year>1995</year>
 		<publisher>BEC</publisher>
 		<info name="serial" value="SHVC-ARMJ-JPN" />
@@ -55841,7 +55841,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinshog">
-		<description>Shin Shougi Club (Jpn)</description>
+		<description>Shin Shougi Club (Japan)</description>
 		<year>1995</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-AHJJ-JPN" />
@@ -55859,7 +55859,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinstrk" cloneof="stng">
-		<description>Shin Star Trek - Ooinaru Isan IFD no Nazo o Oe (Jpn)</description>
+		<description>Shin Star Trek - Ooinaru Isan IFD no Nazo o Oe (Japan)</description>
 		<year>1995</year>
 		<publisher>Takuma Shoten</publisher>
 		<info name="serial" value="SHVC-XN" />
@@ -55875,7 +55875,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinkouk">
-		<description>Shinchou Kouki (Jpn)</description>
+		<description>Shinchou Kouki (Japan)</description>
 		<year>1993</year>
 		<publisher>Yanoman Games</publisher>
 		<info name="serial" value="SHVC-NT" />
@@ -55892,7 +55892,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinri2">
-		<description>The Shinri Game 2 - Magical Trip (Jpn)</description>
+		<description>The Shinri Game 2 - Magical Trip (Japan)</description>
 		<year>1995</year>
 		<publisher>Visit</publisher>
 		<info name="serial" value="SHVC-ASIJ-JPN" />
@@ -55907,7 +55907,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinri3">
-		<description>The Shinri Game 3 (Jpn)</description>
+		<description>The Shinri Game 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Visit</publisher>
 		<info name="serial" value="SHVC-AK3J-JPN" />
@@ -55922,7 +55922,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinri">
-		<description>The Shinri Game - Akuma no Kokoroji (Jpn)</description>
+		<description>The Shinri Game - Akuma no Kokoroji (Japan)</description>
 		<year>1993</year>
 		<publisher>Visit</publisher>
 		<info name="serial" value="SHVC-AK" />
@@ -55939,7 +55939,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shingpx">
-		<description>Shinseiki GPX Cyber Formula (Jpn)</description>
+		<description>Shinseiki GPX Cyber Formula (Japan)</description>
 		<year>1992</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-CF" />
@@ -55954,7 +55954,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinodys">
-		<description>Shinseiki Odysselya (Jpn)</description>
+		<description>Shinseiki Odysselya (Japan)</description>
 		<year>1993</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="SHVC-OL" />
@@ -55971,7 +55971,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinodyss" cloneof="shinodys">
-		<description>Shinseiki Odysselya (Jpn, Sample)</description>
+		<description>Shinseiki Odysselya (Japan, sample)</description>
 		<year>1993</year>
 		<publisher>Vic Tokai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -55985,7 +55985,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinody2">
-		<description>Shinseiki Odysselya II (Jpn)</description>
+		<description>Shinseiki Odysselya II (Japan)</description>
 		<year>1995</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="SHVC-AOLJ-JPN" />
@@ -56002,7 +56002,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shinigo">
-		<description>Shinzui Taikyoku Igo - Go Sennin (Jpn)</description>
+		<description>Shinzui Taikyoku Igo - Go Sennin (Japan)</description>
 		<year>1995</year>
 		<publisher>J-Wing</publisher>
 		<info name="serial" value="SHVC-AWGJ-JPN" />
@@ -56019,7 +56019,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shirorng">
-		<description>Shiroi Ring e - Twinkle Little Star (Jpn)</description>
+		<description>Shiroi Ring e - Twinkle Little Star (Japan)</description>
 		<year>1995</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-ALOJ (PCPE-00502)" />
@@ -56036,7 +56036,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shodaneka" cloneof="shodanek">
-		<description>Shodai Nekketsu Kouha Kunio-kun (Jpn)</description>
+		<description>Shodai Nekketsu Kouha Kunio-kun (Japan)</description>
 		<year>1992</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-KN" />
@@ -56054,7 +56054,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 <!-- Can we consider this board confirmed? -->
 	<software name="shodanek">
-		<description>Shodai Nekketsu Kouha Kunio-kun (Jpn, Rev. A)</description>
+		<description>Shodai Nekketsu Kouha Kunio-kun (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-KN" />
@@ -56080,7 +56080,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shodanin">
-		<description>Shodani Nintei - Shodan Pro Mahjong (Jpn)</description>
+		<description>Shodani Nintei - Shodan Pro Mahjong (Japan)</description>
 		<year>1995</year>
 		<publisher>Gaps</publisher>
 		<info name="serial" value="SHVC-A28J-JPN" />
@@ -56097,7 +56097,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shogiclb">
-		<description>Shougi Club (Jpn)</description>
+		<description>Shougi Club (Japan)</description>
 		<year>1995</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-AHEJ-JPN" />
@@ -56112,7 +56112,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shogifuu">
-		<description>Shougi Fuurinkazan (Jpn)</description>
+		<description>Shougi Fuurinkazan (Japan)</description>
 		<year>1993</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-FJ (R88V5947)" />
@@ -56129,7 +56129,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shogisai">
-		<description>Shougi Saikyou (Jpn)</description>
+		<description>Shougi Saikyou (Japan)</description>
 		<year>1995</year>
 		<publisher>Magical</publisher>
 		<info name="serial" value="SHVC-AMSJ-JPN" />
@@ -56147,7 +56147,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shogisa2">
-		<description>Shougi Saikyou II - Jissen Taikyoku Hen (Jpn)</description>
+		<description>Shougi Saikyou II - Jissen Taikyoku Hen (Japan)</description>
 		<year>1996</year>
 		<publisher>Magical</publisher>
 		<info name="serial" value="SHVC-AX2J-JPN" />
@@ -56165,7 +56165,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shogizan">
-		<description>Shougi Zanmai (Jpn)</description>
+		<description>Shougi Zanmai (Japan)</description>
 		<year>1995</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="serial" value="SHVC-AVEJ-JPN" />
@@ -56182,7 +56182,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ninjasas">
-		<description>Shounen Ninja Sasuke (Jpn)</description>
+		<description>Shounen Ninja Sasuke (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-EO" />
@@ -56199,7 +56199,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ninjasasp" cloneof="ninjasas">
-		<description>Shounen Ninja Sasuke (Jpn, prototype)</description>
+		<description>Shounen Ninja Sasuke (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<part name="cart" interface="snes_cart">
@@ -56214,7 +56214,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 <!-- This is identical (except for the internal header) to the Proto above -->
 	<software name="ninjasass" cloneof="ninjasas">
-		<description>Shounen Ninja Sasuke (Jpn, Sample)</description>
+		<description>Shounen Ninja Sasuke (Japan, sample)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<part name="cart" interface="snes_cart">
@@ -56240,7 +56240,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sidepockj" cloneof="sidepock">
-		<description>Side Pocket (Jpn)</description>
+		<description>Side Pocket (Japan)</description>
 		<year>1994</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-4P" />
@@ -56255,7 +56255,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="simantj" cloneof="simant">
-		<description>SimAnt (Jpn)</description>
+		<description>SimAnt (Japan)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AN" />
@@ -56346,7 +56346,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="bartnighj" cloneof="bartnigh">
-		<description>The Simpsons - Bart's Nightmare (Jpn)</description>
+		<description>The Simpsons - Bart's Nightmare (Japan)</description>
 		<year>1993</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-BN" />
@@ -56373,7 +56373,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="proyakyu">
-		<description>Simulation Pro Yakyuu (Jpn)</description>
+		<description>Simulation Pro Yakyuu (Japan)</description>
 		<year>1995</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-AHAJ-JPN" />
@@ -56417,7 +56417,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="skiparad" cloneof="valdiser">
-		<description>Ski Paradise with Snowboard (Jpn)</description>
+		<description>Ski Paradise with Snowboard (Japan)</description>
 		<year>1994</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-XS" />
@@ -56484,7 +56484,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="slapstic" cloneof="robotrek">
-		<description>Slap Stick (Jpn)</description>
+		<description>Slap Stick (Japan)</description>
 		<year>1994</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-E9" />
@@ -56538,7 +56538,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="snoopy">
-		<description>Snoopy Concert (Jpn)</description>
+		<description>Snoopy Concert (Japan)</description>
 		<year>1995</year>
 		<publisher>Mitsui Bussan</publisher>
 		<info name="serial" value="SHVC-A3PJ-JPN" />
@@ -56579,7 +56579,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="soccerkdjp" cloneof="soccerkd">
-		<description>Soccer Kid (Jpn, prototype)</description>
+		<description>Soccer Kid (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Yanoman Games</publisher>
 		<part name="cart" interface="snes_cart">
@@ -56591,7 +56591,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="soccerkdj" cloneof="soccerkd">
-		<description>Soccer Kid (Jpn)</description>
+		<description>Soccer Kid (Japan)</description>
 		<year>1993</year>
 		<publisher>Yanoman Games</publisher>
 		<info name="serial" value="SHVC-YK" />
@@ -56632,7 +56632,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="solidrun">
-		<description>Solid Runner (Jpn)</description>
+		<description>Solid Runner (Japan)</description>
 		<year>1997</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AAAJ-JPN" />
@@ -56649,7 +56649,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="solstic2" cloneof="equinox">
-		<description>Solstice II (Jpn)</description>
+		<description>Solstice II (Japan)</description>
 		<year>1993</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-EX (ESPG48)" />
@@ -56666,7 +56666,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="songmstr">
-		<description>Song Master (Jpn)</description>
+		<description>Song Master (Japan)</description>
 		<year>1992</year>
 		<publisher>Yanoman Games</publisher>
 		<info name="serial" value="SHVC-YM" />
@@ -56695,7 +56695,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbmj" cloneof="sbm">
-		<description>Sonic Blast Man (Jpn)</description>
+		<description>Sonic Blast Man (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-SK" />
@@ -56723,7 +56723,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbm2j" cloneof="sbm2">
-		<description>Sonic Blast Man II (Jpn)</description>
+		<description>Sonic Blast Man II (Japan)</description>
 		<year>1994</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-2C" />
@@ -56738,7 +56738,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sonicwing" cloneof="aerofgt">
-		<description>Sonic Wings (Jpn)</description>
+		<description>Sonic Wings (Japan)</description>
 		<year>1993</year>
 		<publisher>Video System</publisher>
 		<info name="serial" value="SHVC-HW" />
@@ -56753,7 +56753,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ebisumar">
-		<description>Soreyuke Ebisumaru Karakuri Meiro - Kieta Goemon no Nazo!! (Jpn)</description>
+		<description>Soreyuke Ebisumaru Karakuri Meiro - Kieta Goemon no Nazo!! (Japan)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AK7J-JPN" />
@@ -56782,7 +56782,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sotsugyo">
-		<description>Sotsugyou Bangai Hen - Nee Mahjong Shiyo! (Jpn)</description>
+		<description>Sotsugyou Bangai Hen - Nee Mahjong Shiyo! (Japan)</description>
 		<year>1994</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-A2KJ-JPN" />
@@ -56799,7 +56799,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="astralb">
-		<description>Sougou Kakutougi - Astral Bout (Jpn)</description>
+		<description>Sougou Kakutougi - Astral Bout (Japan)</description>
 		<year>1992</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="SHVC-AB (KIS-1)" />
@@ -56814,7 +56814,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="astralb2">
-		<description>Sougou Kakutougi - Astral Bout 2 - The Total Fighters (Jpn)</description>
+		<description>Sougou Kakutougi - Astral Bout 2 - The Total Fighters (Japan)</description>
 		<year>1994</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="SHVC-EJ (KIS-3)" />
@@ -56830,7 +56830,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="astralb3">
-		<description>Sougou Kakutougi Rings - Astral Bout 3 (Jpn)</description>
+		<description>Sougou Kakutougi Rings - Astral Bout 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="SHVC-AABJ (KIS-5)" />
@@ -56846,7 +56846,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="votoms">
-		<description>Soukou Kihei Votoms - The Battling Road (Jpn)</description>
+		<description>Soukou Kihei Votoms - The Battling Road (Japan)</description>
 		<year>1993</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-VO" />
@@ -56866,7 +56866,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="soulswrd">
-		<description>Soul &amp; Sword (Jpn)</description>
+		<description>Soul &amp; Sword (Japan)</description>
 		<year>1993</year>
 		<publisher>Zamuse</publisher>
 		<info name="serial" value="SHVC-SV" />
@@ -56898,7 +56898,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="soulblzrf" cloneof="soulblzr">
-		<description>Soul Blazer (Fra)</description>
+		<description>Soul Blazer (France)</description>
 		<year>1994</year>
 		<publisher>Enix</publisher>
 		<info name="release" value="19940127" />
@@ -56914,7 +56914,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="soundfct">
-		<description>Sound Factory (Jpn)</description>
+		<description>Sound Factory (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -56940,7 +56940,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spaceacej" cloneof="spaceace">
-		<description>Space Ace (Jpn)</description>
+		<description>Space Ace (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-IS" />
@@ -56981,7 +56981,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spacebob" cloneof="bob">
-		<description>Space Funky B.O.B. (Jpn)</description>
+		<description>Space Funky B.O.B. (Japan)</description>
 		<year>1993</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-B4" />
@@ -57048,7 +57048,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sparkwld">
-		<description>Spark World (Jpn)</description>
+		<description>Spark World (Japan)</description>
 		<year>1995</year>
 		<publisher>Den'Z</publisher>
 		<info name="serial" value="SHVC-ADWJ-JPN" />
@@ -57076,7 +57076,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sparkstrj" cloneof="sparkstr">
-		<description>Sparkster (Jpn)</description>
+		<description>Sparkster (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-ASSJ-JPN" />
@@ -57298,7 +57298,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spindizzj" cloneof="spindizz">
-		<description>Spindizzy Worlds (Jpn)</description>
+		<description>Spindizzy Worlds (Japan)</description>
 		<year>1992</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-SX" />
@@ -57390,7 +57390,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spriggan">
-		<description>Spriggan Powered (Jpn)</description>
+		<description>Spriggan Powered (Japan)</description>
 		<year>1996</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-AXJJ-JPN" />
@@ -57405,7 +57405,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sprinter">
-		<description>Sprinter Monogatari - Mezase!! Ikkakusenkin (Jpn)</description>
+		<description>Sprinter Monogatari - Mezase!! Ikkakusenkin (Japan)</description>
 		<year>1995</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-AKGJ-JPN" />
@@ -57441,7 +57441,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="starfox2">
 		<!-- compiled from source by an Argonaut dev, newer but inaccurate header -->
-		<description>Star Fox 2 (Jpn, prototype)</description>
+		<description>Star Fox 2 (Japan, prototype)</description>
 		<year>1995</year>
 		<publisher>Argonaut</publisher> <!-- cancelled -->
 		<part name="cart" interface="snes_cart">
@@ -57457,7 +57457,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="starfox2a" cloneof="starfox2">
 		<!-- compiled from source by an Argonaut dev, older -->
-		<description>Star Fox 2 (Jpn, earlier prototype)</description>
+		<description>Star Fox 2 (Japan, earlier prototype)</description>
 		<year>1995</year>
 		<publisher>Argonaut</publisher> <!-- cancelled -->
 		<part name="cart" interface="snes_cart">
@@ -57521,7 +57521,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="stsfleetg" cloneof="stsfleet">
-		<description>Star Trek - Starfleet Academy - Starship Bridge Simulator (Ger)</description>
+		<description>Star Trek - Starfleet Academy - Starship Bridge Simulator (Germany)</description>
 		<year>1994</year>
 		<publisher>Interplay</publisher>
 		<part name="cart" interface="snes_cart">
@@ -57573,7 +57573,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="stardust">
-		<description>Stardust Suplex (Jpn)</description>
+		<description>Stardust Suplex (Japan)</description>
 		<year>1995</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-AVLJ-JPN" />
@@ -57588,7 +57588,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="stargatej" cloneof="stargate">
-		<description>Stargate (Jpn)</description>
+		<description>Stargate (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AGTJ-JPN" />
@@ -57628,7 +57628,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="starwingswc" cloneof="starwing">
-		<description>Starwing - Competition (Euro, Not for sale)</description>
+		<description>Starwing - Competition (Euro, not for sale)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-FU-EEC" />
@@ -57644,7 +57644,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="starwinggce" cloneof="starwing">
-		<description>Starwing - Competition (Ger, Not for sale)</description>
+		<description>Starwing - Competition (Germany, not for sale)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SNSP-FU-EEC" />
@@ -57660,7 +57660,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="stealth">
-		<description>Stealth (Jpn)</description>
+		<description>Stealth (Japan)</description>
 		<year>1992</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-H7" />
@@ -57677,7 +57677,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="stonprotj" cloneof="stonprot">
-		<description>Stone Protectors (Jpn)</description>
+		<description>Stone Protectors (Japan)</description>
 		<year>1995</year>
 		<publisher>Kecmo</publisher>
 		<info name="serial" value="SHVC-ASOJ-JPN" />
@@ -57766,7 +57766,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sracerj" cloneof="sracer">
-		<description>Street Racer (Jpn)</description>
+		<description>Street Racer (Japan)</description>
 		<year>1994</year>
 		<publisher>Ubi Soft</publisher>
 		<info name="serial" value="SHVC-ASRJ-JPN" />
@@ -57806,7 +57806,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgunnerj" cloneof="sgunner">
-		<description>Strike Gunner S.T.G (Jpn)</description>
+		<description>Strike Gunner S.T.G (Japan)</description>
 		<year>1992</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-SG" />
@@ -57864,7 +57864,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sugoi">
-		<description>Sugoi Hebereke (Jpn)</description>
+		<description>Sugoi Hebereke (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-QH" />
@@ -57880,7 +57880,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sugoroqs">
-		<description>Sugoro Quest++ - Dicenics (Jpn)</description>
+		<description>Sugoro Quest++ - Dicenics (Japan)</description>
 		<year>1994</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="SHVC-XQ" />
@@ -57897,7 +57897,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sugoroku">
-		<description>Sugoroku Ginga Senki (Jpn)</description>
+		<description>Sugoroku Ginga Senki (Japan)</description>
 		<year>1996</year>
 		<publisher>Bottom Up</publisher>
 		<info name="serial" value="SHVC-AU5J-JPN" />
@@ -57939,7 +57939,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supapoon">
-		<description>Supapoon (Jpn)</description>
+		<description>Supapoon (Japan)</description>
 		<year>1995</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-A5YJ-JPN" />
@@ -57954,7 +57954,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supapndx">
-		<description>Supapoon DX (Jpn)</description>
+		<description>Supapoon DX (Japan)</description>
 		<year>1995</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-A3YJ-JPN" />
@@ -57969,7 +57969,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="super4wd" cloneof="suprbaja">
-		<description>Super 4WD - The Baja (Jpn)</description>
+		<description>Super 4WD - The Baja (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-R8" />
@@ -58062,7 +58062,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="alestej" cloneof="aleste">
-		<description>Super Aleste (Jpn)</description>
+		<description>Super Aleste (Japan)</description>
 		<year>1992</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="SHVC-AT" />
@@ -58127,7 +58127,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="backtof2">
-		<description>Super Back to the Future Part II (Jpn)</description>
+		<description>Super Back to the Future Part II (Japan)</description>
 		<year>1993</year>
 		<publisher>Toshiba EMI</publisher>
 		<info name="serial" value="SHVC-B2 (TOPN-2004)" />
@@ -58142,7 +58142,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbaken95">
-		<description>Super Baken Ou '95 (Jpn)</description>
+		<description>Super Baken Ou '95 (Japan)</description>
 		<year>1995</year>
 		<publisher>Teichiku</publisher>
 		<info name="serial" value="SHVC-A4TJ-JPN" />
@@ -58259,7 +58259,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbtankj" cloneof="sbtank">
-		<description>Garry Kitchen's Super Battletank (Jpn)</description>
+		<description>Garry Kitchen's Super Battletank (Japan)</description>
 		<year>1993</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-SB" />
@@ -58312,7 +58312,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbtank2j" cloneof="sbtank2">
-		<description>Super Battletank 2 (Jpn)</description>
+		<description>Super Battletank 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-2X" />
@@ -58327,7 +58327,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbtank2s" cloneof="sbtank2">
-		<description>Super Battletank 2 (Spa)</description>
+		<description>Super Battletank 2 (Spain)</description>
 		<year>1994</year>
 		<publisher>Sony Imagesoft</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58352,7 +58352,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbikkuri">
-		<description>Super Bikkuriman (Jpn)</description>
+		<description>Super Bikkuriman (Japan)</description>
 		<year>1993</year>
 		<publisher>BEC</publisher>
 		<info name="serial" value="SHVC-BM" />
@@ -58367,7 +58367,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbillard" cloneof="champool">
-		<description>Super Billiard - Championship Pool (Jpn)</description>
+		<description>Super Billiard - Championship Pool (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-IP" />
@@ -58382,7 +58382,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="birdrush">
-		<description>Super Birdie Rush (Jpn)</description>
+		<description>Super Birdie Rush (Japan)</description>
 		<year>1992</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-BH" />
@@ -58399,7 +58399,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sblkbassj" cloneof="sblkbass">
-		<description>Super Black Bass (Jpn)</description>
+		<description>Super Black Bass (Japan)</description>
 		<year>1992</year>
 		<publisher>Hot-B</publisher>
 		<info name="serial" value="SHVC-BQ" />
@@ -58414,7 +58414,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sblkbas2" cloneof="blackbas">
-		<description>Super Black Bass 2 (Jpn)</description>
+		<description>Super Black Bass 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Starfish</publisher>
 		<info name="serial" value="SHVC-AB2J-JPN" />
@@ -58432,7 +58432,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sblkbas3">
-		<description>Super Black Bass 3 (Jpn, Rev. A)</description>
+		<description>Super Black Bass 3 (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Starfish</publisher>
 		<info name="serial" value="SHVA-A3SJ" />
@@ -58450,7 +58450,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sblkbas3a" cloneof="sblkbas3">
-		<description>Super Black Bass 3 (Jpn)</description>
+		<description>Super Black Bass 3 (Japan)</description>
 		<year>1995</year>
 		<publisher>Starfish</publisher>
 		<info name="serial" value="SHVA-A3SJ" />
@@ -58480,7 +58480,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbombmanus" cloneof="sbombman">
-		<description>Super Bomberman (USA, Sample)</description>
+		<description>Super Bomberman (USA, sample)</description>
 		<year>1993</year>
 		<publisher>Hudson</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58492,7 +58492,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbombmn2jc" cloneof="sbombmn2">
-		<description>Super Bomberman 2 (Jpn, Caravan You Taikenban)</description>
+		<description>Super Bomberman 2 (Japan, Caravan You Taikenban)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58516,7 +58516,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbombmn3jp" cloneof="sbombmn3">
-		<description>Super Bomberman 3 (Jpn, prototype)</description>
+		<description>Super Bomberman 3 (Japan, prototype)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58528,7 +58528,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbombmn4">
-		<description>Super Bomberman 4 (Jpn)</description>
+		<description>Super Bomberman 4 (Japan)</description>
 		<year>1996</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-A4BJ-JPN" />
@@ -58543,7 +58543,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbombmn5c" cloneof="sbombmn5">
-		<description>Super Bomberman 5 (Jpn, Caravan Event Ban)</description>
+		<description>Super Bomberman 5 (Japan, Caravan Event Ban)</description>
 		<year>1997</year>
 		<publisher>Hudson</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58557,7 +58557,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sbombmn5">
-		<description>Super Bomberman 5 (Jpn)</description>
+		<description>Super Bomberman 5 (Japan)</description>
 		<year>1997</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-A5SJ-JPN" />
@@ -58639,7 +58639,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="scaesarsj" cloneof="scaesars">
-		<description>Super Casino - Caesars Palace (Jpn, Rev. A)</description>
+		<description>Super Casino - Caesars Palace (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-KH" />
@@ -58654,7 +58654,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="scaesarsja" cloneof="scaesars">
-		<description>Super Casino - Caesars Palace (Jpn)</description>
+		<description>Super Casino - Caesars Palace (Japan)</description>
 		<year>1993</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-KH" />
@@ -58669,7 +58669,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="scasino2">
-		<description>Super Casino 2 (Jpn)</description>
+		<description>Super Casino 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-OE" />
@@ -58684,7 +58684,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="scastles">
-		<description>Super Castles (Jpn)</description>
+		<description>Super Castles (Japan)</description>
 		<year>1994</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-AVIJ-JPN" />
@@ -58726,7 +58726,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supchinf">
-		<description>Super Chinese Fighter (Jpn)</description>
+		<description>Super Chinese Fighter (Japan)</description>
 		<year>1995</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-ACWJ-JPN" />
@@ -58741,7 +58741,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="schinwl2s" cloneof="schinwl2">
-		<description>Super Chinese World 2 - Uchuu Ichibutou Taikai (Jpn, Sample)</description>
+		<description>Super Chinese World 2 - Uchuu Ichibutou Taikai (Japan, sample)</description>
 		<year>1993</year>
 		<publisher>Culture Brain</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58753,7 +58753,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="schinwl3">
-		<description>Super Chinese World 3 - Chou Jigen Daisakusen (Jpn)</description>
+		<description>Super Chinese World 3 - Chou Jigen Daisakusen (Japan)</description>
 		<year>1995</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-AWQJ-JPN" />
@@ -58800,7 +58800,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suprcopa" cloneof="worldsoc">
-		<description>Super Copa (Bra)</description>
+		<description>Super Copa (Brazil)</description>
 		<year>1994</year>
 		<publisher>American Softworks Company</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58812,7 +58812,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="daikokai" cloneof="unchartd">
-		<description>Super Daikoukai Jidai (Jpn, Rev. A, NP)</description>
+		<description>Super Daikoukai Jidai (Japan, Rev. A, NP)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-QK" />
@@ -58829,7 +58829,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdanyp" cloneof="sdany">
-		<description>Super Dany (Fra, prototype)</description>
+		<description>Super Dany (France, prototype)</description>
 		<year>1998</year>
 		<publisher>Virgin Interactive</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58841,7 +58841,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdany">
-		<description>Super Dany (Fra)</description>
+		<description>Super Dany (France)</description>
 		<year>1998</year>
 		<publisher>Virgin Interactive</publisher>
 		<part name="cart" interface="snes_cart">
@@ -58853,7 +58853,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdogfght" cloneof="turnburn">
-		<description>Super Dogfight (Jpn)</description>
+		<description>Super Dogfight (Japan)</description>
 		<year>1994</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-ZN" />
@@ -58880,7 +58880,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="syakuman">
-		<description>Super Double Yakuman (Jpn)</description>
+		<description>Super Double Yakuman (Japan)</description>
 		<year>1994</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-7V" />
@@ -58896,7 +58896,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="syakumn2">
-		<description>Super Double Yakuman II (Jpn)</description>
+		<description>Super Double Yakuman II (Japan)</description>
 		<year>1997</year>
 		<publisher>VAP</publisher>
 		<info name="serial" value="SHVC-AYXJ-JPN" />
@@ -58912,7 +58912,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdrakkhn" cloneof="dview">
-		<description>Super Drakkhen (Jpn)</description>
+		<description>Super Drakkhen (Japan)</description>
 		<year>1994</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-XO" />
@@ -58929,7 +58929,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdrifto">
-		<description>Super Drift Out - World Rally Championships (Jpn)</description>
+		<description>Super Drift Out - World Rally Championships (Japan)</description>
 		<year>1995</year>
 		<publisher>Visco</publisher>
 		<info name="serial" value="SHVC-ADOJ-JPN" />
@@ -58959,7 +58959,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdunksht">
-		<description>Super Dunk Shot (Jpn)</description>
+		<description>Super Dunk Shot (Japan)</description>
 		<year>1992</year>
 		<publisher>HAL Laboratory</publisher>
 		<info name="serial" value="SHVC-DU" />
@@ -58974,7 +58974,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sdunkstr">
-		<description>Super Dunk Star (Jpn)</description>
+		<description>Super Dunk Star (Japan)</description>
 		<year>1993</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-DC" />
@@ -58989,7 +58989,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superedf" cloneof="earthdef">
-		<description>Super E.D.F. (Jpn)</description>
+		<description>Super E.D.F. (Japan)</description>
 		<year>1991</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-ED" />
@@ -59004,7 +59004,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supf1cg">
-		<description>Super F1 Circus Gaiden (Jpn)</description>
+		<description>Super F1 Circus Gaiden (Japan)</description>
 		<year>1995</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AN4J-JPN" />
@@ -59026,7 +59026,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supf1ltd">
-		<description>Super F1 Circus Limited (Jpn)</description>
+		<description>Super F1 Circus Limited (Japan)</description>
 		<year>1992</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-FD" />
@@ -59043,7 +59043,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="famiwars">
-		<description>Super Famicom Wars (Jpn, NP)</description>
+		<description>Super Famicom Wars (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BFWJ-JPN" />
@@ -59060,7 +59060,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="famigela">
-		<description>Super Family Gelaende (Jpn, NP)</description>
+		<description>Super Family Gelaende (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-A25J-JPN" />
@@ -59079,7 +59079,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="famitenn" cloneof="smashten">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Family Tennis (Jpn)</description>
+		<description>Super Family Tennis (Japan)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-JA" />
@@ -59094,7 +59094,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="finmatch">
-		<description>Super Final Match Tennis (Jpn)</description>
+		<description>Super Final Match Tennis (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-F9" />
@@ -59110,7 +59110,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="fireprw3e" cloneof="fireprw3">
-		<description>Super Fire Pro Wrestling III - Easy Type (Jpn)</description>
+		<description>Super Fire Pro Wrestling III - Easy Type (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-3E" />
@@ -59126,7 +59126,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="fireprw3">
-		<description>Super Fire Pro Wrestling III - Final Bout (Jpn, Rev. A)</description>
+		<description>Super Fire Pro Wrestling III - Final Bout (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-F3" />
@@ -59145,7 +59145,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="fireprxp">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Fire Pro Wrestling X Premium (Jpn)</description>
+		<description>Super Fire Pro Wrestling X Premium (Japan)</description>
 		<year>1996</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-AF6J-JPN" /> <!-- NP cart: SHVC-MMSA-JPN-1 -->
@@ -59178,7 +59178,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="fishbigf">
-		<description>Super Fishing Big Fight (Jpn)</description>
+		<description>Super Fishing Big Fight (Japan)</description>
 		<year>1994</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-ANFJ-JPN" />
@@ -59195,7 +59195,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="forms95u">
-		<description>Super Formation Soccer 95 della Serie A UCC Xaqua (Jpn, Not for sale)</description>
+		<description>Super Formation Soccer 95 della Serie A UCC Xaqua (Japan, not for sale)</description>
 		<year>1995</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-ADEJ-JPN" />
@@ -59213,7 +59213,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="forms96">
-		<description>Super Formation Soccer 96 - World Club Edition (Jpn)</description>
+		<description>Super Formation Soccer 96 - World Club Edition (Japan)</description>
 		<year>1996</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-A96J-JPN" />
@@ -59265,7 +59265,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgachapn">
-		<description>Super Gachapon World - SD Gundam X (Jpn)</description>
+		<description>Super Gachapon World - SD Gundam X (Japan)</description>
 		<year>1992</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-GX" />
@@ -59282,7 +59282,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgenjin2">
-		<description>Super Genjin 2 (Jpn)</description>
+		<description>Super Genjin 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AZ7J-JPN" />
@@ -59337,7 +59337,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgodzilj" cloneof="sgodzil">
-		<description>Chou Godzilla - Super Godzilla (Jpn, Rev. A)</description>
+		<description>Chou Godzilla - Super Godzilla (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="SHVC-7G" />
@@ -59352,7 +59352,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgodzilja" cloneof="sgodzil">
-		<description>Chou Godzilla - Super Godzilla (Jpn)</description>
+		<description>Chou Godzilla - Super Godzilla (Japan)</description>
 		<year>1993</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="SHVC-7G" />
@@ -59380,7 +59380,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgomokun">
-		<description>Super Gomoku Narabe - Renju (Jpn)</description>
+		<description>Super Gomoku Narabe - Renju (Japan)</description>
 		<year>1994</year>
 		<publisher>Naxat Soft</publisher>
 		<info name="serial" value="SHVC-5N" />
@@ -59396,7 +59396,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgomokus">
-		<description>Super Gomoku Shougi - Jouseki Kenkyuu Hen (Jpn)</description>
+		<description>Super Gomoku Shougi - Jouseki Kenkyuu Hen (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AGSJ-JPN" />
@@ -59414,7 +59414,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgossunpa" cloneof="sgossun">
-		<description>Super Gussun Oyoyo (Jpn, prototype, alt)</description>
+		<description>Super Gussun Oyoyo (Japan, prototype, alt)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<part name="cart" interface="snes_cart">
@@ -59428,7 +59428,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgossun">
-		<description>Super Gussun Oyoyo (Jpn)</description>
+		<description>Super Gussun Oyoyo (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AP7J-JPN" />
@@ -59445,7 +59445,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgossun2">
-		<description>Super Gussun Oyoyo 2 (Jpn)</description>
+		<description>Super Gussun Oyoyo 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A8BJ-JPN" />
@@ -59462,7 +59462,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superhq" cloneof="schasehq">
-		<description>Super H.Q. - Criminal Chaser (Jpn)</description>
+		<description>Super H.Q. - Criminal Chaser (Japan)</description>
 		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="SHVC-HF" />
@@ -59477,7 +59477,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suphana">
-		<description>Super Hanafuda (Jpn)</description>
+		<description>Super Hanafuda (Japan)</description>
 		<year>1994</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-Q5" />
@@ -59494,7 +59494,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suphana2">
-		<description>Super Hanafuda 2 (Jpn)</description>
+		<description>Super Hanafuda 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-AHNJ-JPN" />
@@ -59534,7 +59534,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="shocke94" cloneof="superice">
-		<description>Super Hockey '94 (Jpn)</description>
+		<description>Super Hockey '94 (Japan)</description>
 		<year>1994</year>
 		<publisher>Party Room 21</publisher>
 		<info name="serial" value="SHVC-OX" />
@@ -59564,7 +59564,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="shockeyf" cloneof="shockey">
 		<!-- Y~K -->
-		<description>Super Hockey (Fra)</description>
+		<description>Super Hockey (France)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -59590,7 +59590,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suprindy">
-		<description>Super Indy Champ (Jpn)</description>
+		<description>Super Indy Champ (Japan)</description>
 		<year>1994</year>
 		<publisher>Forum</publisher>
 		<info name="serial" value="SHVC-OI" />
@@ -59645,7 +59645,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sjpond2j" cloneof="sjpond2">
-		<description>Super James Pond II (Jpn)</description>
+		<description>Super James Pond II (Japan)</description>
 		<year>1993</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-V6" />
@@ -59660,7 +59660,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sjangou">
-		<description>Super Jangou (Jpn)</description>
+		<description>Super Jangou (Japan)</description>
 		<year>1995</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-AJ4J-JPN" />
@@ -59677,7 +59677,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sjinsei3">
-		<description>Super Jinsei Game 3 (Jpn, Rev. A)</description>
+		<description>Super Jinsei Game 3 (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-A3XJ-JPN" />
@@ -59694,7 +59694,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="skeirin">
-		<description>Super Keirin (Jpn)</description>
+		<description>Super Keirin (Japan)</description>
 		<year>1995</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-AKRJ-JPN" />
@@ -59712,7 +59712,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="skickbox" cloneof="bestof">
-		<description>Super Kick Boxing - Best of the Best (Jpn)</description>
+		<description>Super Kick Boxing - Best of the Best (Japan)</description>
 		<year>1993</year>
 		<publisher>Electro Brain</publisher>
 		<info name="serial" value="SHVC-BE" />
@@ -59727,7 +59727,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="skickoff" cloneof="kickoff">
-		<description>Super Kick Off (Jpn)</description>
+		<description>Super Kick Off (Japan)</description>
 		<year>1992</year>
 		<publisher>Misawa Entertainment</publisher>
 		<info name="serial" value="SHVC-KO" />
@@ -59744,7 +59744,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="skoukou">
-		<description>Super Koukou Yakyuu - Ikkyuu Nyuukon (Jpn)</description>
+		<description>Super Koukou Yakyuu - Ikkyuu Nyuukon (Japan)</description>
 		<year>1994</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-Q6" />
@@ -59761,7 +59761,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sylphid">
-		<description>Super Kyousouba - Kaze no Sylphid (Jpn)</description>
+		<description>Super Kyousouba - Kaze no Sylphid (Japan)</description>
 		<year>1993</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="SHVC-KJ (KIS-2)" />
@@ -59779,7 +59779,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superkyoa" cloneof="superkyo">
-		<description>Super Kyoutei (Jpn)</description>
+		<description>Super Kyoutei (Japan)</description>
 		<year>1995</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-AKYJ-JPN" />
@@ -59796,7 +59796,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="slinearb" cloneof="spacefoo">
-		<description>Super Linearball (Jpn)</description>
+		<description>Super Linearball (Japan)</description>
 		<year>1992</year>
 		<publisher>Hiro</publisher>
 		<info name="serial" value="SHVC-SJ" />
@@ -59824,7 +59824,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="smadchmp">
-		<description>Super Mad Champ (Jpn)</description>
+		<description>Super Mad Champ (Japan)</description>
 		<year>1995</year>
 		<publisher>Tsukuda Original</publisher>
 		<info name="serial" value="SHVC-ACHJ-JPN" />
@@ -59839,7 +59839,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supermj3">
-		<description>Super Mahjong 3 - Karakuchi (Jpn)</description>
+		<description>Super Mahjong 3 - Karakuchi (Japan)</description>
 		<year>1994</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-Q8" />
@@ -59857,7 +59857,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supermjtc" cloneof="supermjt">
-		<description>Super Mahjong Taikai (Jpn, Rev. B)</description>
+		<description>Super Mahjong Taikai (Japan, Rev. B)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IQ" />
@@ -59874,7 +59874,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supermjtb" cloneof="supermjt">
-		<description>Super Mahjong Taikai (Jpn, Rev. C)</description>
+		<description>Super Mahjong Taikai (Japan, Rev. C)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IQ" />
@@ -59891,7 +59891,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supermjt">
-		<description>Super Mahjong Taikai (Jpn, Rev. E)</description>
+		<description>Super Mahjong Taikai (Japan, Rev. E)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IQ" />
@@ -59908,7 +59908,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="smw2ja" cloneof="smw2">
-		<description>Super Mario - Yossy Island (Jpn, Rev. A)</description>
+		<description>Super Mario - Yossy Island (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-YI" />
@@ -59927,7 +59927,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="smw2j" cloneof="smw2">
-		<description>Super Mario - Yossy Island (Jpn, Rev. B)</description>
+		<description>Super Mario - Yossy Island (Japan, Rev. B)</description>
 		<year>1995</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-YI" />
@@ -59962,7 +59962,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<software name="smcoll" cloneof="smas">
 		<!-- Notes: Also re-released through Nintendo Power -->
-		<description>Super Mario Collection (Jpn, Rev. A)</description>
+		<description>Super Mario Collection (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-4M" />
@@ -60013,7 +60013,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supermoe">
-		<description>Super Moero!! Pro Yakyuu (Jpn)</description>
+		<description>Super Moero!! Pro Yakyuu (Japan)</description>
 		<year>1994</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-AB3J-JPN" />
@@ -60031,7 +60031,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="smomodxa" cloneof="smomodx">
-		<description>Super Momotarou Dentetsu DX - Jr Nishi-Nihon Presents (Jpn, Not for sale)</description>
+		<description>Super Momotarou Dentetsu DX - Jr Nishi-Nihon Presents (Japan, not for sale)</description>
 		<year>1995?</year>
 		<publisher>Hudson</publisher>
 		<part name="cart" interface="snes_cart">
@@ -60057,7 +60057,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="snazopu2">
-		<description>Super Nazo Puyo Tsuu - Rulue no Tetsuwan Hanjouki (Jpn)</description>
+		<description>Super Nazo Puyo Tsuu - Rulue no Tetsuwan Hanjouki (Japan)</description>
 		<year>1996</year>
 		<publisher>Compile</publisher>
 		<info name="serial" value="SHVC-A8PJ-JPN" />
@@ -60074,7 +60074,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nichimj3">
-		<description>Super Nichibutsu Mahjong 3 - Yoshimoto Gekijou Hen (Jpn)</description>
+		<description>Super Nichibutsu Mahjong 3 - Yoshimoto Gekijou Hen (Japan)</description>
 		<year>1994</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-3J" />
@@ -60089,7 +60089,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="nichimj4">
-		<description>Super Nichibutsu Mahjong 4 - Kisokenkyuu Hen (Jpn)</description>
+		<description>Super Nichibutsu Mahjong 4 - Kisokenkyuu Hen (Japan)</description>
 		<year>1996</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="serial" value="SHVC-A4MJ-JPN" />
@@ -60117,7 +60117,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ninjakun">
-		<description>Super Ninja-kun (Jpn)</description>
+		<description>Super Ninja-kun (Japan)</description>
 		<year>1994</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-8Q" />
@@ -60182,7 +60182,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superoffj" cloneof="superoff">
-		<description>Super Off Road (Jpn)</description>
+		<description>Super Off Road (Japan)</description>
 		<year>1992</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-FR" />
@@ -60222,7 +60222,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superozup" cloneof="superozu">
-		<description>Super Oozumou - Nessen Ooichiban (Jpn, prototype)</description>
+		<description>Super Oozumou - Nessen Ooichiban (Japan, prototype)</description>
 		<year>1992</year>
 		<publisher>Namco</publisher>
 		<part name="cart" interface="snes_cart">
@@ -60246,7 +60246,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spangj" cloneof="spang">
-		<description>Super Pang (Jpn)</description>
+		<description>Super Pang (Japan)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-SN" />
@@ -60274,7 +60274,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spinbaljp" cloneof="spinbal">
-		<description>Super Pinball - Behind the Mask (Jpn, prototype)</description>
+		<description>Super Pinball - Behind the Mask (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -60299,7 +60299,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spinbal2">
-		<description>Super Pinball II - The Amazing Odyssey (Jpn)</description>
+		<description>Super Pinball II - The Amazing Odyssey (Japan)</description>
 		<year>1995</year>
 		<publisher>Meldac</publisher>
 		<info name="serial" value="SHVC-APLJ-JPN" />
@@ -60330,7 +60330,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spleagu2">
-		<description>Super Power League 2 (Jpn, Rev. A)</description>
+		<description>Super Power League 2 (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-Z4" />
@@ -60347,7 +60347,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sprobots" cloneof="sprobot">
-		<description>Super Probotector - Alien Rebels (Euro, Sample)</description>
+		<description>Super Probotector - Alien Rebels (Euro, sample)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<part name="cart" interface="snes_cart">
@@ -60359,7 +60359,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spbaseb2">
-		<description>Super Professional Baseball II (Jpn)</description>
+		<description>Super Professional Baseball II (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-PB" />
@@ -60376,7 +60376,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suppunchj" cloneof="suppunch">
-		<description>Super Punch-Out!! (Jpn, NP)</description>
+		<description>Super Punch-Out!! (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-4Q" />
@@ -60435,7 +60435,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spuyop2">
-		<description>Super Puyo Puyo Tsuu (Jpn)</description>
+		<description>Super Puyo Puyo Tsuu (Japan)</description>
 		<year>1995</year>
 		<publisher>Compile</publisher>
 		<info name="serial" value="SHVC-AXPJ-JPN" />
@@ -60450,7 +60450,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="spuyop2r">
-		<description>Super Puyo Puyo Tsuu Remix (Jpn)</description>
+		<description>Super Puyo Puyo Tsuu Remix (Japan)</description>
 		<year>1996</year>
 		<publisher>Compile</publisher>
 		<info name="serial" value="SHVC-A7PJ-JPN" />
@@ -60465,7 +60465,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="srtypej" cloneof="srtype">
-		<description>Super R-Type (Jpn)</description>
+		<description>Super R-Type (Japan)</description>
 		<year>1991</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="SHVC-SR" />
@@ -60493,7 +60493,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="srmp5">
-		<description>Super Real Mahjong PV Paradise - All-Star 4-nin Uchi (Jpn)</description>
+		<description>Super Real Mahjong PV Paradise - All-Star 4-nin Uchi (Japan)</description>
 		<year>1995</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="SHVC-A5PJ-JPN" />
@@ -60509,7 +60509,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="srobotg" supported="partial">
-		<description>Super Robot Taisen Gaiden - Masou Kishin - The Lord of Elemental (Jpn)</description>
+		<description>Super Robot Taisen Gaiden - Masou Kishin - The Lord of Elemental (Japan)</description>
 		<year>1996</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-ALXJ-JPN" />
@@ -60527,7 +60527,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sroyalbl" cloneof="gemfire">
-		<description>Super Royal Blood (Jpn)</description>
+		<description>Super Royal Blood (Japan)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-IU" />
@@ -60557,7 +60557,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sshangh" cloneof="shangh2">
-		<description>Super Shanghai - Dragon's Eye (Hot-B) (Jpn)</description>
+		<description>Super Shanghai - Dragon's Eye (Hot-B) (Japan)</description>
 		<year>1992</year>
 		<publisher>Hot-B</publisher>
 		<info name="serial" value="SHVC-DE" />
@@ -60572,7 +60572,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sshangha" cloneof="shangh2">
-		<description>Super Shanghai - Dragon's Eye (Activision) (Jpn)</description>
+		<description>Super Shanghai - Dragon's Eye (Activision) (Japan)</description>
 		<year>1994</year>
 		<publisher>Activision</publisher>
 		<info name="serial" value="SHVC-IE" />
@@ -60587,7 +60587,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sshogia" cloneof="sshogi">
-		<description>Super Shougi (Jpn)</description>
+		<description>Super Shougi (Japan)</description>
 		<year>1992</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-SD" />
@@ -60604,7 +60604,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sshogi3">
-		<description>Super Shougi 3 - Kitaihei (Jpn)</description>
+		<description>Super Shougi 3 - Kitaihei (Japan)</description>
 		<year>1995</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="SHVC-A3IJ-JPN" />
@@ -60622,7 +60622,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sslapshtj" cloneof="sslapsht">
-		<description>Super Slap Shot (Jpn)</description>
+		<description>Super Slap Shot (Japan)</description>
 		<year>1993</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-ZX" />
@@ -60662,7 +60662,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ssnakey" cloneof="wildsnak">
-		<description>Super Snakey (Jpn)</description>
+		<description>Super Snakey (Japan)</description>
 		<year>1994</year>
 		<publisher>Yojigen</publisher>
 		<info name="serial" value="SHVC-AWSJ-JPN" />
@@ -60728,7 +60728,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suprsoko">
-		<description>Super Soukoban (Jpn)</description>
+		<description>Super Soukoban (Japan)</description>
 		<year>1993</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-VN" />
@@ -60743,7 +60743,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="starwarsj" cloneof="starwars">
-		<description>Super Star Wars (Jpn)</description>
+		<description>Super Star Wars (Japan)</description>
 		<year>1992</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="serial" value="SHVC-V4" />
@@ -60770,7 +60770,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="jedij" cloneof="jedi">
-		<description>Super Star Wars - Jedi no Fukushuu (Jpn)</description>
+		<description>Super Star Wars - Jedi no Fukushuu (Japan)</description>
 		<year>1995</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="serial" value="SHVC-ARJJ-JPN" />
@@ -60809,7 +60809,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="esbj" cloneof="esb">
-		<description>Super Star Wars - Teikoku no Gyakushuu (Jpn)</description>
+		<description>Super Star Wars - Teikoku no Gyakushuu (Japan)</description>
 		<year>1993</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="serial" value="SHVC-V9" />
@@ -60897,7 +60897,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sswivj" cloneof="sswiv">
-		<description>Super SWIV (Jpn)</description>
+		<description>Super SWIV (Japan)</description>
 		<year>1992</year>
 		<publisher>Coconuts Japan Entertainment</publisher>
 		<info name="serial" value="SHVC-SQ" />
@@ -60912,7 +60912,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="supertek">
-		<description>Super Tekkyuu Fight! (Jpn)</description>
+		<description>Super Tekkyuu Fight! (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AIBJ-JPN" />
@@ -60976,7 +60976,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="strollj" cloneof="stroll">
-		<description>Super Troll Islands (Jpn)</description>
+		<description>Super Troll Islands (Japan)</description>
 		<year>1994</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-9T" />
@@ -60991,7 +60991,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="strump">
-		<description>Super Trump Collection (Jpn)</description>
+		<description>Super Trump Collection (Japan)</description>
 		<year>1995</year>
 		<publisher>Bottom Up</publisher>
 		<info name="serial" value="SHVC-AT7J-JPN" />
@@ -61006,7 +61006,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="strump2">
-		<description>Super Trump Collection 2 (Jpn)</description>
+		<description>Super Trump Collection 2 (Japan)</description>
 		<year>1996</year>
 		<publisher>Bottom Up</publisher>
 		<info name="serial" value="SHVC-AQKJ-JPN" />
@@ -61021,7 +61021,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suptsume">
-		<description>Super Tsumeshougi 1000 (Jpn)</description>
+		<description>Super Tsumeshougi 1000 (Japan)</description>
 		<year>1994</year>
 		<publisher>Bottom Up</publisher>
 		<info name="serial" value="SHVC-AIOJ-JPN" />
@@ -61036,7 +61036,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sturricj" cloneof="sturric">
-		<description>Super Turrican (Jpn)</description>
+		<description>Super Turrican (Japan)</description>
 		<year>1993</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="SHVC-T9" />
@@ -61100,7 +61100,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="subaseb2" cloneof="bbsim1k2">
-		<description>Super Ultra Baseball 2 (Jpn)</description>
+		<description>Super Ultra Baseball 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-UO" />
@@ -61117,7 +61117,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superunoa" cloneof="superuno">
-		<description>Super Uno (Jpn)</description>
+		<description>Super Uno (Japan)</description>
 		<year>1993</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-UN" />
@@ -61146,7 +61146,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="svgeo">
-		<description>Super Variable Geo (Jpn)</description>
+		<description>Super Variable Geo (Japan)</description>
 		<year>1995</year>
 		<publisher>TGL</publisher>
 		<info name="serial" value="SHVC-AXYJ-JPN" />
@@ -61161,7 +61161,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="svolley2" cloneof="hyprvbal">
-		<description>Super Volley II (Jpn)</description>
+		<description>Super Volley II (Japan)</description>
 		<year>1992</year>
 		<publisher>Video System</publisher>
 		<info name="serial" value="SHVC-VB" />
@@ -61191,7 +61191,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wrestang">
-		<description>Super Wrestle Angels (Jpn)</description>
+		<description>Super Wrestle Angels (Japan)</description>
 		<year>1994</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AWAJ-JPN" />
@@ -61208,7 +61208,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superyak">
-		<description>Super Yakyuudou (Jpn)</description>
+		<description>Super Yakyuudou (Japan)</description>
 		<year>1996</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A82J-JPN" />
@@ -61225,7 +61225,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superzug">
-		<description>Super Zugan - Hakotenjou kara no Shoutaijou (Jpn)</description>
+		<description>Super Zugan - Hakotenjou kara no Shoutaijou (Japan)</description>
 		<year>1994</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-ZU" />
@@ -61240,7 +61240,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="superzu2">
-		<description>Super Zugan 2 - Tsukanpo Fighter (Jpn)</description>
+		<description>Super Zugan 2 - Tsukanpo Fighter (Japan)</description>
 		<year>1994</year>
 		<publisher>J-Wing</publisher>
 		<info name="serial" value="SHVC-AJZJ-JPN" />
@@ -61255,7 +61255,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sutobasu">
-		<description>Sutobasu Yarou Show (Jpn)</description>
+		<description>Sutobasu Yarou Show (Japan)</description>
 		<year>1994</year>
 		<publisher>B-AI</publisher>
 		<info name="serial" value="SHVC-3X" />
@@ -61270,7 +61270,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suttehak">
-		<description>Sutte Hakkun (Jpn)</description>
+		<description>Sutte Hakkun (Japan)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BSHJ-JPN" />
@@ -61287,7 +61287,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suzuka8j" cloneof="suzuka8">
-		<description>Suzuka 8 Hours (Jpn)</description>
+		<description>Suzuka 8 Hours (Japan)</description>
 		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-8H" />
@@ -61337,7 +61337,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="suzukif1j" cloneof="suzukif1">
-		<description>Suzuki Aguri no F-1 Super Driving (Jpn)</description>
+		<description>Suzuki Aguri no F-1 Super Driving (Japan)</description>
 		<year>1992</year>
 		<publisher>LOZC</publisher>
 		<info name="serial" value="SHVC-GF" />
@@ -61367,7 +61367,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="swordman" cloneof="xkaliber">
-		<description>Sword Maniac (Jpn)</description>
+		<description>Sword Maniac (Japan)</description>
 		<year>1994</year>
 		<publisher>Toshiba EMI</publisher>
 		<info name="serial" value="SHVC-S5 (TOPN-2003)" />
@@ -61395,7 +61395,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="syndicatj" cloneof="syndicat">
-		<description>Syndicate (Jpn)</description>
+		<description>Syndicate (Japan)</description>
 		<year>1995</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-AFYJ-JPN" />
@@ -61437,7 +61437,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="syvalionj" cloneof="syvalion">
-		<description>Syvalion (Jpn)</description>
+		<description>Syvalion (Japan)</description>
 		<year>1992</year>
 		<publisher>Toshiba EMI</publisher>
 		<info name="serial" value="SHVC-SY (TOPN-2002)" />
@@ -61452,7 +61452,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="t2agj" cloneof="t2ag">
-		<description>T2 - The Arcade Game (Jpn)</description>
+		<description>T2 - The Arcade Game (Japan)</description>
 		<year>1994</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-XV" />
@@ -61480,7 +61480,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tablgame">
-		<description>Table Game Daishuugou!! (Jpn)</description>
+		<description>Table Game Daishuugou!! (Japan)</description>
 		<year>1996</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-AG8J-JPN" />
@@ -61495,7 +61495,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tactogrea" cloneof="tactogre">
-		<description>Tactics Ogre - Let Us Cling Together (Jpn, Rev. A)</description>
+		<description>Tactics Ogre - Let Us Cling Together (Japan, Rev. A)</description>
 		<year>1995</year>
 		<publisher>Quest</publisher>
 		<info name="serial" value="SHVC-AO7J-JPN" />
@@ -61512,7 +61512,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tactogre">
-		<description>Tactics Ogre - Let Us Cling Together (Jpn, Rev. B)</description>
+		<description>Tactics Ogre - Let Us Cling Together (Japan, Rev. B)</description>
 		<year>1995</year>
 		<publisher>Quest</publisher>
 		<info name="serial" value="SHVC-AO7J-JPN" />
@@ -61529,7 +61529,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tactogreb" cloneof="tactogre">
-		<description>Tactics Ogre - Let Us Cling Together (Jpn)</description>
+		<description>Tactics Ogre - Let Us Cling Together (Japan)</description>
 		<year>1995</year>
 		<publisher>Quest</publisher>
 		<info name="serial" value="SHVC-AO7J-JPN" />
@@ -61546,7 +61546,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tadaima">
-		<description>Tadaima Yuusha Boshuuchuu Okawari (Jpn)</description>
+		<description>Tadaima Yuusha Boshuuchuu Okawari (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-ATYJ-JPN" />
@@ -61564,7 +61564,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="taekwon">
-		<description>Taekwon-Do (Jpn)</description>
+		<description>Taekwon-Do (Japan)</description>
 		<year>1994</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-II" />
@@ -61592,7 +61592,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="brassnum" cloneof="doomsday">
-		<description>Taiketsu!! Brass Numbers (Jpn)</description>
+		<description>Taiketsu!! Brass Numbers (Japan)</description>
 		<year>1992</year>
 		<publisher>Laser Soft</publisher>
 		<info name="serial" value="SHVC-TB" />
@@ -61607,7 +61607,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="taikyoid">
-		<description>Taikyoku Igo - Idaten (Jpn)</description>
+		<description>Taikyoku Igo - Idaten (Japan)</description>
 		<year>1995</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-AIIJ-JPN" />
@@ -61625,7 +61625,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="16mj">
-		<description>16-Zhang Mahjang - Xingzuo Nulang Pian (Tw)</description>
+		<description>16-Zhang Mahjang - Xingzuo Nulang Pian (Taiwan)</description>
 		<year>199?</year>
 		<publisher>&lt;unlicensed&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -61637,7 +61637,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="takamei2" cloneof="advisl2">
-		<description>Takahashi Meijin no Daiboukenjima II (Jpn)</description>
+		<description>Takahashi Meijin no Daiboukenjima II (Japan)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AT2J-JPN" />
@@ -61654,7 +61654,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="gimemory">
-		<description>Take Yutaka GI Memory (Jpn)</description>
+		<description>Take Yutaka GI Memory (Japan)</description>
 		<year>1995</year>
 		<publisher>N&amp;G Project</publisher>
 		<info name="serial" value="SHVC-AGBJ-JPN" />
@@ -61671,7 +61671,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="takemiya">
-		<description>Takemiya Masaki Kudan no Igo Taishou (Jpn)</description>
+		<description>Takemiya Masaki Kudan no Igo Taishou (Japan)</description>
 		<year>1995</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-AITJ-JPN" />
@@ -61689,7 +61689,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tamatown">
-		<description>Tamagotchi Town (Jpn, NP)</description>
+		<description>Tamagotchi Town (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-BTTJ-JPN" />
@@ -61706,7 +61706,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tarot">
-		<description>Tarot Mystery (Jpn)</description>
+		<description>Tarot Mystery (Japan)</description>
 		<year>1995</year>
 		<publisher>Visit</publisher>
 		<info name="serial" value="SHVC-AT5J-JPN" />
@@ -61733,7 +61733,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tatkgen2" cloneof="congocap">
-		<description>Tatakae Genshijin 2 - Rookie no Bouken (Jpn)</description>
+		<description>Tatakae Genshijin 2 - Rookie no Bouken (Japan)</description>
 		<year>1992</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-J2" />
@@ -61748,7 +61748,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tatkgen3" cloneof="joemac3">
-		<description>Tatakae Genshijin 3 - Shuyaku wa Yappari Joe &amp; Mac (Jpn)</description>
+		<description>Tatakae Genshijin 3 - Shuyaku wa Yappari Joe &amp; Mac (Japan)</description>
 		<year>1994</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="SHVC-J3" />
@@ -61816,7 +61816,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tecmobbj" cloneof="tecmobb">
-		<description>Tecmo Super Baseball (Jpn)</description>
+		<description>Tecmo Super Baseball (Japan)</description>
 		<year>1994</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-ATBJ-JPN" />
@@ -61862,7 +61862,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tecmosbwj" cloneof="tecmosbw">
-		<description>Tecmo Super Bowl (Jpn)</description>
+		<description>Tecmo Super Bowl (Japan)</description>
 		<year>1993</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-7T" />
@@ -61892,7 +61892,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tecmosb2j" cloneof="tecmosb2">
-		<description>Tecmo Super Bowl II - Special Edition (Jpn)</description>
+		<description>Tecmo Super Bowl II - Special Edition (Japan)</description>
 		<year>1994</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-ASBJ-JPN" />
@@ -62030,7 +62030,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="teiketsu" cloneof="pto">
-		<description>Teitoku no Ketsudan (Jpn, Rev. A)</description>
+		<description>Teitoku no Ketsudan (Japan, Rev. A)</description>
 		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-TK" />
@@ -62047,7 +62047,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tekikeib">
-		<description>Tekichuu Keiba Juku (Jpn)</description>
+		<description>Tekichuu Keiba Juku (Japan)</description>
 		<year>1996</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-APCJ-JPN" />
@@ -62064,7 +62064,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tenchis" cloneof="tenchi">
-		<description>Tenchi Muyou! - Game Hen (Jpn, Sample)</description>
+		<description>Tenchi Muyou! - Game Hen (Japan, sample)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<part name="cart" interface="snes_cart">
@@ -62078,7 +62078,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tenchiso" cloneof="terranig">
-		<description>Tenchi Souzou (Jpn)</description>
+		<description>Tenchi Souzou (Japan)</description>
 		<year>1995</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-AQTJ-JPN" />
@@ -62095,7 +62095,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tengaim0sj" cloneof="tengaim0" supported="no"> <!-- unemulated additional hardware (SPC7110) -->
-		<description>Tengai Makyou Zero Shounen Jump no Shou (Jpn, Not for sale)</description>
+		<description>Tengai Makyou Zero Shounen Jump no Shou (Japan, not for sale)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-AZQJ-JPN" />
@@ -62111,7 +62111,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="prowrevo" cloneof="hammerlk">
-		<description>Tenryuu Genichirou no Pro Wrestling Revolution (Jpn)</description>
+		<description>Tenryuu Genichirou no Pro Wrestling Revolution (Japan)</description>
 		<year>1994</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-LJ" />
@@ -62127,7 +62127,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tenshiut">
-		<description>Tenshi no Uta - Shiroki Tsubasa no Inori (Jpn)</description>
+		<description>Tenshi no Uta - Shiroki Tsubasa no Inori (Japan)</description>
 		<year>1994</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="serial" value="SHVC-UA" />
@@ -62209,7 +62209,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="terranigg" cloneof="terranig">
-		<description>Terranigma (Ger, Rev. A)</description>
+		<description>Terranigma (Germany, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -62224,7 +62224,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="terranigs" cloneof="terranig">
-		<description>Terranigma (Spa)</description>
+		<description>Terranigma (Spain)</description>
 		<year>1996</year>
 		<publisher>Nintendo</publisher>
 		<sharedfeat name="compatibility" value="PAL"/>
@@ -62279,7 +62279,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tetrisbt">
-		<description>Tetris Battle Gaiden (Jpn)</description>
+		<description>Tetris Battle Gaiden (Japan)</description>
 		<year>1993</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-4G" />
@@ -62295,7 +62295,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tetrisfl" cloneof="tetris2">
-		<description>Tetris Flash (Jpn)</description>
+		<description>Tetris Flash (Japan)</description>
 		<year>1994</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-27" />
@@ -62311,7 +62311,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tetsuwan">
-		<description>Tetsuwan Atom (Jpn)</description>
+		<description>Tetsuwan Atom (Japan)</description>
 		<year>1994</year>
 		<publisher>Zamuse</publisher>
 		<info name="serial" value="SHVC-ZB" />
@@ -62364,7 +62364,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="thobreed">
-		<description>Thoroughbred Breeder (Jpn)</description>
+		<description>Thoroughbred Breeder (Japan)</description>
 		<year>1993</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-TF" />
@@ -62381,7 +62381,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="thobred2">
-		<description>Thoroughbred Breeder II (Jpn)</description>
+		<description>Thoroughbred Breeder II (Japan)</description>
 		<year>1994</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-QW" />
@@ -62398,7 +62398,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="thobred3">
-		<description>Thoroughbred Breeder III (Jpn)</description>
+		<description>Thoroughbred Breeder III (Japan)</description>
 		<year>1996</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="SHVC-AIWJ-JPN" />
@@ -62415,7 +62415,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tspiritsj" cloneof="tspirits">
-		<description>Thunder Spirits (Jpn)</description>
+		<description>Thunder Spirits (Japan)</description>
 		<year>1991</year>
 		<publisher>Toshiba EMI</publisher>
 		<info name="serial" value="SHVC-TH (TOPN-2001)" />
@@ -62443,7 +62443,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tbirds">
-		<description>Thunderbirds - Kokusai Kyuujotai Shutsudou seyo! (Jpn)</description>
+		<description>Thunderbirds - Kokusai Kyuujotai Shutsudou seyo! (Japan)</description>
 		<year>1993</year>
 		<publisher>Cobra Team</publisher>
 		<info name="serial" value="SHVC-T5" />
@@ -62544,7 +62544,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="timecopj" cloneof="timecop">
-		<description>Timecop (Jpn)</description>
+		<description>Timecop (Japan)</description>
 		<year>1995</year>
 		<publisher>Victor Entertainment</publisher>
 		<info name="serial" value="SHVC-ATCJ-JPN" />
@@ -62585,7 +62585,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ttoonbbls" cloneof="ttoonbbl">
-		<description>Tiny Toon Adventures - Buster Busts Loose! (Spa)</description>
+		<description>Tiny Toon Adventures - Buster Busts Loose! (Spain)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<part name="cart" interface="snes_cart">
@@ -62609,7 +62609,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ttoondd" cloneof="ttoonwak">
-		<description>Tiny Toon Adventures - Dotabata Daiundoukai (Jpn)</description>
+		<description>Tiny Toon Adventures - Dotabata Daiundoukai (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-5Z" />
@@ -62704,7 +62704,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tokimekia" cloneof="tokimeki">
-		<description>Tokimeki Memorial - Densetsu no Ki no Shita de (Jpn)</description>
+		<description>Tokimeki Memorial - Densetsu no Ki no Shita de (Japan)</description>
 		<year>1996</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-AM8J-JPN" />
@@ -62722,7 +62722,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tokoromj">
-		<description>Tokoro's Mahjong (Jpn)</description>
+		<description>Tokoro's Mahjong (Japan)</description>
 		<year>1994</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="SHVC-ATMJ-JPN" />
@@ -62749,7 +62749,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tomjerryj" cloneof="tomjerry">
-		<description>Tom &amp; Jerry (Jpn)</description>
+		<description>Tom &amp; Jerry (Japan)</description>
 		<year>1993</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="SHVC-TJ" />
@@ -62870,7 +62870,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="topracer" cloneof="topgear">
-		<description>Top Racer (Jpn)</description>
+		<description>Top Racer (Japan)</description>
 		<year>1992</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-TR" />
@@ -62885,7 +62885,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="topracr2" cloneof="topgear2">
-		<description>Top Racer 2 (Jpn)</description>
+		<description>Top Racer 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="SHVC-2P" />
@@ -62901,7 +62901,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="toride">
-		<description>Toride (Jpn)</description>
+		<description>Toride (Japan)</description>
 		<year>1994</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="SHVC-ACSJ-JPN" />
@@ -62977,7 +62977,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="luckyman">
-		<description>Tottemo! Lucky Man - Lucky Cookie Roulette de Totsugeki!! (Jpn)</description>
+		<description>Tottemo! Lucky Man - Lucky Cookie Roulette de Totsugeki!! (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-ALAJ-JPN" />
@@ -62992,7 +62992,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tougedenp" cloneof="tougeden">
-		<description>Touge Densetsu - Saisoku Battle (Jpn, prototype)</description>
+		<description>Touge Densetsu - Saisoku Battle (Japan, prototype)</description>
 		<year>1996</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<part name="cart" interface="snes_cart">
@@ -63006,7 +63006,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="towerdrm">
-		<description>Tower Dream (Jpn)</description>
+		<description>Tower Dream (Japan)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AT9J-JPN" />
@@ -63023,7 +63023,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="toystoryj" cloneof="toystory">
-		<description>Toy Story (Jpn)</description>
+		<description>Toy Story (Japan)</description>
 		<year>1996</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AQHJ-JPN" />
@@ -63065,7 +63065,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="traverse">
-		<description>Traverse - Starlight &amp; Prairie (Jpn)</description>
+		<description>Traverse - Starlight &amp; Prairie (Japan)</description>
 		<year>1996</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A2SJ-JPN" />
@@ -63094,7 +63094,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="trinea">
-		<description>Trinea (Jpn)</description>
+		<description>Trinea (Japan)</description>
 		<year>1993</year>
 		<publisher>Yanoman Games</publisher>
 		<info name="serial" value="SHVC-T6" />
@@ -63258,7 +63258,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="trueliesg" cloneof="truelies">
-		<description>True Lies (Ger)</description>
+		<description>True Lies (Germany)</description>
 		<year>1995</year>
 		<publisher>LJN</publisher>
 		<part name="cart" interface="snes_cart">
@@ -63270,7 +63270,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="trueliesj" cloneof="truelies">
-		<description>True Lies (Jpn)</description>
+		<description>True Lies (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-ATLJ-JPN" />
@@ -63310,7 +63310,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="trumpisl" cloneof="supersol">
-		<description>Trump Island (Jpn)</description>
+		<description>Trump Island (Japan)</description>
 		<year>1995</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-LT" />
@@ -63325,7 +63325,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tsukiko">
-		<description>Tsukikomori (Jpn)</description>
+		<description>Tsukikomori (Japan)</description>
 		<year>1996</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-A7MJ-JPN" />
@@ -63342,7 +63342,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tsuppari">
-		<description>Tsuppari Oozumou - Risshinshusse Hen (Jpn)</description>
+		<description>Tsuppari Oozumou - Risshinshusse Hen (Japan)</description>
 		<year>1993</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-KW" />
@@ -63359,7 +63359,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tsuyoshi">
-		<description>Tsuyoshi Shikkari Shinasai - Taisen Puzzle Dama (Jpn)</description>
+		<description>Tsuyoshi Shikkari Shinasai - Taisen Puzzle Dama (Japan)</description>
 		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="SHVC-ATPJ-JPN" />
@@ -63400,7 +63400,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="turfhero">
-		<description>Turf Hero (Jpn)</description>
+		<description>Turf Hero (Japan)</description>
 		<year>1995</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="SHVC-ATUJ-JPN" />
@@ -63418,7 +63418,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="turfmemo">
-		<description>Turf Memories (Jpn)</description>
+		<description>Turf Memories (Japan)</description>
 		<year>1995</year>
 		<publisher>BEC</publisher>
 		<info name="serial" value="SHVC-AYZJ-JPN" />
@@ -63476,7 +63476,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="janjugak">
-		<description>U-Jin Janjuu Gakuen (Jpn)</description>
+		<description>U-Jin Janjuu Gakuen (Japan)</description>
 		<year>1993</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-UJ" />
@@ -63491,7 +63491,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="janjuga2">
-		<description>U-Jin Janjuu Gakuen 2 (Jpn)</description>
+		<description>U-Jin Janjuu Gakuen 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="SHVC-9U" />
@@ -63506,7 +63506,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="furifuri">
-		<description>U-Jin no Furi Furi Girls (Jpn)</description>
+		<description>U-Jin no Furi Furi Girls (Japan)</description>
 		<year>1994</year>
 		<publisher>Planning Office WADA</publisher>
 		<info name="serial" value="SHVC-U3" />
@@ -63521,7 +63521,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ufokamenk" cloneof="ufokamen">
-		<description>U.F.O. Kamen Yakisoban - Kettler no Kuroi Inbou Keihin Ban (Jpn, Not for sale)</description>
+		<description>U.F.O. Kamen Yakisoban - Kettler no Kuroi Inbou Keihin Ban (Japan, not for sale)</description>
 		<year>1994</year>
 		<publisher>Den'Z</publisher>
 		<info name="serial" value="SHVC-Y7" />
@@ -63534,7 +63534,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ufokamen">
-		<description>U.F.O. Kamen Yakisoban - Kettler no Kuroi Inbou (Jpn)</description>
+		<description>U.F.O. Kamen Yakisoban - Kettler no Kuroi Inbou (Japan)</description>
 		<year>1994</year>
 		<publisher>Den'Z</publisher>
 		<info name="serial" value="SHVC-Y9" />
@@ -63573,7 +63573,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tekkamanp" cloneof="tekkaman">
-		<description>Uchuu no Kishi Tekkaman Blade (Jpn, prototype)</description>
+		<description>Uchuu no Kishi Tekkaman Blade (Japan, prototype)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -63585,7 +63585,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="tekkaman">
-		<description>Uchuu no Kishi Tekkaman Blade (Jpn)</description>
+		<description>Uchuu no Kishi Tekkaman Blade (Japan)</description>
 		<year>1993</year>
 		<publisher>Interbec</publisher>
 		<info name="serial" value="SHVC-T8" />
@@ -63600,7 +63600,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="astrogo">
-		<description>Uchuu Race - Astro Go! Go! (Jpn)</description>
+		<description>Uchuu Race - Astro Go! Go! (Japan)</description>
 		<year>1994</year>
 		<publisher>Meldac</publisher>
 		<info name="serial" value="SHVC-3A" />
@@ -63617,7 +63617,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultimakt">
-		<description>Ultima - Kyouryuu Teikoku (Jpn)</description>
+		<description>Ultima - Kyouryuu Teikoku (Japan)</description>
 		<year>1995</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-AVGJ (PCPE-00501)" />
@@ -63677,7 +63677,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultimag" cloneof="ultimar2">
-		<description>Ultima Gaiden - Kuro Kishi no Inbou (Jpn)</description>
+		<description>Ultima Gaiden - Kuro Kishi no Inbou (Japan)</description>
 		<year>1994</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-6V" />
@@ -63694,7 +63694,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultima6jp" cloneof="ultima6">
-		<description>Ultima VI - Itsuwari no Yogensha (Jpn, prototype)</description>
+		<description>Ultima VI - Itsuwari no Yogensha (Japan, prototype)</description>
 		<year>1992</year>
 		<publisher>Pony Canyon</publisher>
 		<part name="cart" interface="snes_cart">
@@ -63708,7 +63708,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultima6j" cloneof="ultima6">
-		<description>Ultima VI - Itsuwari no Yogensha (Jpn)</description>
+		<description>Ultima VI - Itsuwari no Yogensha (Japan)</description>
 		<year>1992</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-U6 (R98V5942)" />
@@ -63741,7 +63741,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultima7j" cloneof="ultima7">
-		<description>Ultima VII - The Black Gate (Jpn)</description>
+		<description>Ultima VII - The Black Gate (Japan)</description>
 		<year>1994</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="SHVC-7I (R98V5950)" />
@@ -63786,7 +63786,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultfoot" cloneof="footfury">
-		<description>Ultimate Football (Jpn)</description>
+		<description>Ultimate Football (Japan)</description>
 		<year>1992</year>
 		<publisher>Sammy Entertainment</publisher>
 		<info name="serial" value="SHVC-UF" />
@@ -63801,7 +63801,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultrabb2">
-		<description>Ultra Baseball Jitsumei Ban 2 (Jpn)</description>
+		<description>Ultra Baseball Jitsumei Ban 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="SHVC-ABJJ-JPN" />
@@ -63818,7 +63818,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultralea">
-		<description>Ultra League - Moero! Soccer Daikessen!! (Jpn)</description>
+		<description>Ultra League - Moero! Soccer Daikessen!! (Japan)</description>
 		<year>1995</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-A7YJ-JPN" />
@@ -63860,7 +63860,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="uminushi">
-		<description>Umi no Nushi Tsuri (Jpn, Rev. A)</description>
+		<description>Umi no Nushi Tsuri (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="SHVC-A6UJ-JPN" />
@@ -63877,7 +63877,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="umihara">
-		<description>Umihara Kawase (Jpn)</description>
+		<description>Umihara Kawase (Japan)</description>
 		<year>1994</year>
 		<publisher>TNN</publisher>
 		<info name="serial" value="SHVC-ATAJ-JPN" />
@@ -63894,7 +63894,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="umizurim">
-		<description>Umizuri Meijin - Suzuki Hen (Jpn)</description>
+		<description>Umizuri Meijin - Suzuki Hen (Japan)</description>
 		<year>1994</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-AUFJ-JPN" />
@@ -63912,7 +63912,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="umizurimp" cloneof="umizurim">
-		<description>Umizuri Meijin - Suzuki Hen (Jpn, prototype)</description>
+		<description>Umizuri Meijin - Suzuki Hen (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
@@ -63927,7 +63927,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="undake30">
-		<description>Undake 30 Same Game Daisakusen - Mario Version (Jpn, not for sale)</description>
+		<description>Undake 30 Same Game Daisakusen - Mario Version (Japan, not for sale)</description>
 		<year>1995</year>
 		<publisher>Hudson</publisher>
 		<info name="serial" value="SHVC-ANZJ-JPN" />
@@ -63995,7 +63995,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="usaiceh" cloneof="prohocky">
-		<description>USA Ice Hockey (Jpn, Rev. A)</description>
+		<description>USA Ice Hockey (Japan, Rev. A)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-UI" />
@@ -64012,7 +64012,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="usaiceha" cloneof="prohocky">
-		<description>USA Ice Hockey (Jpn)</description>
+		<description>USA Ice Hockey (Japan)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SHVC-UI" />
@@ -64029,7 +64029,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ushio">
-		<description>Ushio to Tora (Jpn)</description>
+		<description>Ushio to Tora (Japan)</description>
 		<year>1993</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHVC-UT" />
@@ -64058,7 +64058,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="utopiag" cloneof="utopia">
-		<description>Utopia - The Creation of a Nation (Ger)</description>
+		<description>Utopia - The Creation of a Nation (Germany)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<part name="cart" interface="snes_cart">
@@ -64072,7 +64072,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="utopiaj" cloneof="utopia">
-		<description>Utopia - The Creation of a Nation (Jpn)</description>
+		<description>Utopia - The Creation of a Nation (Japan)</description>
 		<year>1993</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="SHVC-UP (ESPG49)" />
@@ -64128,7 +64128,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="valdiserfp" cloneof="valdiser">
-		<description>Val d'Isere Championship (Fra, prototype 19931027)</description>
+		<description>Val d'Isere Championship (France, prototype 19931027)</description>
 		<year>1994</year>
 		<publisher>Mindscape</publisher>
 		<part name="cart" interface="snes_cart">
@@ -64194,7 +64194,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="verne">
-		<description>Verne World (Jpn)</description>
+		<description>Verne World (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AVWJ-JPN" />
@@ -64211,7 +64211,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="vikingd" cloneof="lostvik">
-		<description>Viking no Daimeiwaku (Jpn)</description>
+		<description>Viking no Daimeiwaku (Japan)</description>
 		<year>1993</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="serial" value="SHVC-VD" />
@@ -64238,7 +64238,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="vbartj" cloneof="vbart">
-		<description>Virtual Bart (Jpn)</description>
+		<description>Virtual Bart (Japan)</description>
 		<year>1994</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AVBJ-JPN" />
@@ -64308,7 +64308,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="vscoll">
-		<description>Vs. Collection (Jpn)</description>
+		<description>Vs. Collection (Japan)</description>
 		<year>1996</year>
 		<publisher>Bottom Up</publisher>
 		<info name="serial" value="SHVC-AU3J-JPN" />
@@ -64323,7 +64323,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wakuwaku">
-		<description>Wakuwaku Ski Wonder Spur (Jpn)</description>
+		<description>Wakuwaku Ski Wonder Spur (Japan)</description>
 		<year>1995</year>
 		<publisher>Human Entertainment</publisher>
 		<info name="serial" value="SHVC-ASKJ-JPN" />
@@ -64340,7 +64340,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wallysag">
-		<description>Wally o Sagase! - Ehon no Kuni no Daibouken (Jpn)</description>
+		<description>Wally o Sagase! - Ehon no Kuni no Daibouken (Japan)</description>
 		<year>1993</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="SHVC-WA" />
@@ -64383,7 +64383,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="waratte">
-		<description>Waratte Iitomo! Tamolympic (Jpn)</description>
+		<description>Waratte Iitomo! Tamolympic (Japan)</description>
 		<year>1994</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-55" />
@@ -64412,7 +64412,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="warlockj" cloneof="warlock">
-		<description>Warlock (Jpn)</description>
+		<description>Warlock (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AWKJ-JPN" />
@@ -64644,7 +64644,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wildgunsjp" cloneof="wildguns">
-		<description>Wild Guns (Jpn, prototype)</description>
+		<description>Wild Guns (Japan, prototype)</description>
 		<year>1994</year>
 		<publisher>Natsume</publisher>
 		<part name="cart" interface="snes_cart">
@@ -64656,7 +64656,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wildgunsjs" cloneof="wildguns">
-		<description>Wild Guns (Jpn, sample)</description>
+		<description>Wild Guns (Japan, sample)</description>
 		<year>1994</year>
 		<publisher>Natsume</publisher>
 		<part name="cart" interface="snes_cart">
@@ -64668,7 +64668,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wildgunsj" cloneof="wildguns">
-		<description>Wild Guns (Jpn)</description>
+		<description>Wild Guns (Japan)</description>
 		<year>1994</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="SHVC-4W" />
@@ -64784,7 +64784,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="winpst96">
-		<description>Winning Post 2 - Program '96 (Jpn, Rev. A)</description>
+		<description>Winning Post 2 - Program '96 (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AW9J-JPN" />
@@ -64801,7 +64801,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="winpst96a" cloneof="winpst96">
-		<description>Winning Post 2 - Program '96 (Jpn)</description>
+		<description>Winning Post 2 - Program '96 (Japan)</description>
 		<year>1996</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-AW9J-JPN" />
@@ -64856,7 +64856,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wizardg4">
-		<description>Wizardry Gaiden IV - Taima no Kodou (Jpn, Rev. A)</description>
+		<description>Wizardry Gaiden IV - Taima no Kodou (Japan, Rev. A)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AE4J-JPN" />
@@ -64873,7 +64873,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wizardg4a" cloneof="wizardg4">
-		<description>Wizardry Gaiden IV - Taima no Kodou (Jpn)</description>
+		<description>Wizardry Gaiden IV - Taima no Kodou (Japan)</description>
 		<year>1996</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-AE4J-JPN" />
@@ -64890,7 +64890,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wizardry">
-		<description>Wizardry I-II-III - Story of Llylgamyn (Jpn, NP)</description>
+		<description>Wizardry I-II-III - Story of Llylgamyn (Japan, NP)</description>
 		<year>1999</year>
 		<publisher>Media Factory</publisher>
 		<info name="serial" value="SHVC-BWZJ-JPN" />
@@ -64998,7 +64998,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wolverinj" cloneof="wolverin">
-		<description>Wolverine - Adamantium Rage (Jpn)</description>
+		<description>Wolverine - Adamantium Rage (Japan)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AWXJ-JPN" />
@@ -65050,7 +65050,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wprojj">
-		<description>Wonder Project J - Kikai no Shounen Pino (Jpn)</description>
+		<description>Wonder Project J - Kikai no Shounen Pino (Japan)</description>
 		<year>1994</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="SHVC-APJJ-JPN" />
@@ -65067,7 +65067,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wondrmag">
-		<description>Wondrous Magic (Jpn)</description>
+		<description>Wondrous Magic (Japan)</description>
 		<year>1993</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="serial" value="SHVC-UH" />
@@ -65109,7 +65109,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wcrugbyf" cloneof="wcrugby">
-		<description>World Class Rugby (Fra)</description>
+		<description>World Class Rugby (France)</description>
 		<year>1993</year>
 		<publisher>Imagineer</publisher>
 		<part name="cart" interface="snes_cart">
@@ -65121,7 +65121,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wcrugbyj" cloneof="wcrugby">
-		<description>World Class Rugby (Jpn)</description>
+		<description>World Class Rugby (Japan)</description>
 		<year>1993</year>
 		<publisher>Misawa Entertainment</publisher>
 		<info name="serial" value="SHVC-WY" />
@@ -65136,7 +65136,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wcrugby2">
-		<description>World Class Rugby 2 - Kokunai Gekitou Hen '93 (Jpn)</description>
+		<description>World Class Rugby 2 - Kokunai Gekitou Hen '93 (Japan)</description>
 		<year>1994</year>
 		<publisher>Misawa Entertainment</publisher>
 		<info name="serial" value="SHVC-2R" />
@@ -65181,7 +65181,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wcup94j" cloneof="wcup94">
-		<description>World Cup USA 94 (Jpn)</description>
+		<description>World Cup USA 94 (Japan)</description>
 		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SHVC-U4" />
@@ -65240,7 +65240,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wh2j" cloneof="wh2">
-		<description>World Heroes 2 (Jpn)</description>
+		<description>World Heroes 2 (Japan)</description>
 		<year>1994</year>
 		<publisher>Saurus</publisher>
 		<info name="serial" value="SHVC-JI" />
@@ -65367,7 +65367,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wwfroyalj" cloneof="wwfroyal">
-		<description>WWF Royal Rumble (Jpn)</description>
+		<description>WWF Royal Rumble (Japan)</description>
 		<year>1993</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-WU" />
@@ -65407,7 +65407,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="wwfagj" cloneof="wwfag">
-		<description>WWF WrestleMania - The Arcade Game (Jpn)</description>
+		<description>WWF WrestleMania - The Arcade Game (Japan)</description>
 		<year>1996</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<info name="serial" value="SHVC-AWVJ-JPN" />
@@ -65422,7 +65422,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="xproto">
-		<description>X (Jpn, prototype)</description>
+		<description>X (Japan, prototype)</description>
 		<year>199?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -65483,7 +65483,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="xmenj" cloneof="xmen">
-		<description>X-Men - Mutant Apocalypse (Jpn)</description>
+		<description>X-Men - Mutant Apocalypse (Japan)</description>
 		<year>1995</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="SHVC-AXMJ-JPN" />
@@ -65526,7 +65526,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yadamons" cloneof="yadamon">
-		<description>Yadamon - Wonderland Dreams (Jpn, Sample)</description>
+		<description>Yadamon - Wonderland Dreams (Japan, sample)</description>
 		<year>1993</year>
 		<publisher>Tokuma Shoten</publisher>
 		<part name="cart" interface="snes_cart">
@@ -65538,7 +65538,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yadamon">
-		<description>Yadamon - Wonderland Dreams (Jpn)</description>
+		<description>Yadamon - Wonderland Dreams (Japan)</description>
 		<year>1993</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="SHVC-YA" />
@@ -65555,7 +65555,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yakouchu">
-		<description>Yakouchuu (Jpn)</description>
+		<description>Yakouchuu (Japan)</description>
 		<year>1995</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="SHVC-ADJJ-JPN" />
@@ -65572,7 +65572,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yamyam">
-		<description>Yam Yam (Jpn)</description>
+		<description>Yam Yam (Japan)</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="SHVC-AYMJ-JPN" />
@@ -65589,7 +65589,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="bubsyj" cloneof="bubsy">
-		<description>Yamaneko Bubsy no Daibouken (Jpn)</description>
+		<description>Yamaneko Bubsy no Daibouken (Japan)</description>
 		<year>1994</year>
 		<publisher>Poppo</publisher>
 		<info name="serial" value="SHVC-UY" />
@@ -65604,7 +65604,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yogibearj" cloneof="yogibear">
-		<description>Yogi Bear (Jpn)</description>
+		<description>Yogi Bear (Japan)</description>
 		<year>1995</year>
 		<publisher>Magifact</publisher>
 		<info name="serial" value="SHVC-Y8" />
@@ -65631,7 +65631,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yokomsb">
-		<description>Yokoyama Mitsuteru Sangokushi Bangi - Sugoroku Eiyuuki (Jpn)</description>
+		<description>Yokoyama Mitsuteru Sangokushi Bangi - Sugoroku Eiyuuki (Japan)</description>
 		<year>1994</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="SHVC-AYBJ-JPN" />
@@ -65648,7 +65648,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yokozunaa" cloneof="yokozuna">
-		<description>Yokozuna Monogatari (Jpn)</description>
+		<description>Yokozuna Monogatari (Japan)</description>
 		<year>1994</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-5U" />
@@ -65665,7 +65665,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yokozuna">
-		<description>Yokozuna Monogatari (Jpn, Rev. A)</description>
+		<description>Yokozuna Monogatari (Japan, Rev. A)</description>
 		<year>1994</year>
 		<publisher>KSS</publisher>
 		<info name="serial" value="SHVC-5U" />
@@ -65682,7 +65682,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yoshicokj" cloneof="yoshicok">
-		<description>Yoshi no Cookie (Jpn)</description>
+		<description>Yoshi no Cookie (Japan)</description>
 		<year>1993</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-YC" />
@@ -65697,7 +65697,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yoshiovn">
-		<description>Yoshi no Cookie - Kuruppon Oven de Cookie (Jpn, Not for sale)</description>
+		<description>Yoshi no Cookie - Kuruppon Oven de Cookie (Japan, not for sale)</description>
 		<year>1993?</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="SHVC-YO" />
@@ -65763,7 +65763,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="madara">
-		<description>Youchien Senki Madara (Jpn)</description>
+		<description>Youchien Senki Madara (Japan)</description>
 		<year>1996</year>
 		<publisher>Datam Polystar</publisher>
 		<info name="serial" value="SHVC-ADPJ-JPN" />
@@ -65780,7 +65780,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="youkaib" cloneof="jetsons">
-		<description>Youkai Buster - Ruka no Daibouken (Jpn)</description>
+		<description>Youkai Buster - Ruka no Daibouken (Japan)</description>
 		<year>1995</year>
 		<publisher>Kadokawa Shoten</publisher>
 		<info name="serial" value="SHVC-AYOJ-JPN" />
@@ -65820,7 +65820,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ys5ex">
-		<description>Ys V - Expert (Jpn)</description>
+		<description>Ys V - Expert (Japan)</description>
 		<year>1996</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="SHVC-A5EJ-JPN" />
@@ -65838,7 +65838,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ys5">
-		<description>Ys V - Ushinawareta Suna no Miyako Kefin (Jpn)</description>
+		<description>Ys V - Ushinawareta Suna no Miyako Kefin (Japan)</description>
 		<year>1995</year>
 		<publisher>Nihon Falcom</publisher>
 		<info name="serial" value="SHVC-AYVJ-JPN" />
@@ -65856,7 +65856,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yumemabo">
-		<description>Yumemaboroshi no Gotoku (Jpn)</description>
+		<description>Yumemaboroshi no Gotoku (Japan)</description>
 		<year>1993</year>
 		<publisher>Intec</publisher>
 		<info name="serial" value="SHVC-UG" />
@@ -65873,7 +65873,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="yuyufin">
-		<description>Yu Yu Hakusho Final - Makai Saikyou Retsuden (Jpn)</description>
+		<description>Yu Yu Hakusho Final - Makai Saikyou Retsuden (Japan)</description>
 		<year>1995</year>
 		<publisher>Namco</publisher>
 		<info name="serial" value="SHVC-AY3J-JPN" />
@@ -65889,7 +65889,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zakuro">
-		<description>Zakuro no Aji (Jpn)</description>
+		<description>Zakuro no Aji (Japan)</description>
 		<year>1995</year>
 		<publisher>Imagineer</publisher>
 		<info name="serial" value="SHVC-AZAJ-JPN" />
@@ -65906,7 +65906,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zan2">
-		<description>Zan II Spirits (Jpn)</description>
+		<description>Zan II Spirits (Japan)</description>
 		<year>1992</year>
 		<publisher>Wolf Team</publisher>
 		<info name="serial" value="SHVC-ZS" />
@@ -65923,7 +65923,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zan3">
-		<description>Zan III Spirits (Jpn)</description>
+		<description>Zan III Spirits (Japan)</description>
 		<year>1994</year>
 		<publisher>Wolf Team</publisher>
 		<info name="serial" value="SHVC-Z3" />
@@ -65940,7 +65940,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zengt">
-		<description>Zen-Nihon GT Senshuken (Jpn)</description>
+		<description>Zen-Nihon GT Senshuken (Japan)</description>
 		<year>1995</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="SHVC-AGVJ-JPN" />
@@ -65955,7 +65955,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zenprowf">
-		<description>Zen-Nihon Pro Wres - Fight Da Pon! (Jpn)</description>
+		<description>Zen-Nihon Pro Wres - Fight Da Pon! (Japan)</description>
 		<year>1994</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-JF" />
@@ -65970,7 +65970,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zenprowt">
-		<description>Zen-Nihon Pro Wres' - Sekai Saikyou Tag (Jpn)</description>
+		<description>Zen-Nihon Pro Wres' - Sekai Saikyou Tag (Japan)</description>
 		<year>1993</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="SHVC-2J" />
@@ -65985,7 +65985,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ultrashn">
-		<description>Zenkoku Juudan Ultra Shinri Game (Jpn)</description>
+		<description>Zenkoku Juudan Ultra Shinri Game (Japan)</description>
 		<year>1995</year>
 		<publisher>Visit</publisher>
 		<info name="serial" value="SHVC-AZJJ-JPN" />
@@ -66000,7 +66000,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zenkosoc">
-		<description>Zenkoku Koukou Soccer (Jpn)</description>
+		<description>Zenkoku Koukou Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Yojigen</publisher>
 		<info name="serial" value="SHVC-AY5J-JPN" />
@@ -66017,7 +66017,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zenkosc2">
-		<description>Zenkoku Koukou Soccer 2 (Jpn)</description>
+		<description>Zenkoku Koukou Soccer 2 (Japan)</description>
 		<year>1995</year>
 		<publisher>Yojigen</publisher>
 		<info name="serial" value="SHVC-AY7J-JPN" />
@@ -66034,7 +66034,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zero4rr">
-		<description>Zero 4 Champ RR (Jpn)</description>
+		<description>Zero 4 Champ RR (Japan)</description>
 		<year>1994</year>
 		<publisher>Media Rings Corporation</publisher>
 		<info name="serial" value="SHVC-Q4" />
@@ -66052,7 +66052,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zero4rrz">
-		<description>Zero 4 Champ RR-Z (Jpn)</description>
+		<description>Zero 4 Champ RR-Z (Japan)</description>
 		<year>1995</year>
 		<publisher>Media Rings Corporation</publisher>
 		<info name="serial" value="SHVC-ARZJ-JPN" />
@@ -66093,7 +66093,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zico">
-		<description>Zico Soccer (Jpn)</description>
+		<description>Zico Soccer (Japan)</description>
 		<year>1994</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="SHVC-ZD" />
@@ -66108,7 +66108,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zigzag">
-		<description>Zig Zag Cat - Dachou Club mo Oosawagi Da (Jpn)</description>
+		<description>Zig Zag Cat - Dachou Club mo Oosawagi Da (Japan)</description>
 		<year>1994</year>
 		<publisher>Den'Z</publisher>
 		<info name="serial" value="SHVC-ZP" />
@@ -66177,7 +66177,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zoolus" cloneof="zool">
-		<description>Zool (USA, Sample)</description>
+		<description>Zool (USA, sample)</description>
 		<year>1994</year>
 		<publisher>GameTek</publisher>
 		<part name="cart" interface="snes_cart">
@@ -66191,7 +66191,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zoolj" cloneof="zool">
-		<description>Zool no Yume Bouken (Jpn)</description>
+		<description>Zool no Yume Bouken (Japan)</description>
 		<year>1994</year>
 		<publisher>Infocom</publisher>
 		<info name="serial" value="SHVC-Z8" />
@@ -66230,7 +66230,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="zottomj">
-		<description>Zootto Mahjong! (Jpn, NP)</description>
+		<description>Zootto Mahjong! (Japan, NP)</description>
 		<year>1998</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="SHVC-BZMJ-JPN" />
@@ -66350,7 +66350,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="ctrltest">
-		<description>Controller Test Cassette (Jpn)</description>
+		<description>Controller Test Cassette (Japan)</description>
 		<year>199?</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -66375,7 +66375,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 <!-- Notes: this is the dump of the BIOS of a snes modem device and it should be moved to a device -->
 	<software name="xbandj" cloneof="xband">
-		<description>X Band (Jpn)</description>
+		<description>X Band (Japan)</description>
 		<year>1995</year>
 		<publisher>Catapult Entertainment</publisher>
 		<part name="cart" interface="snes_cart">
@@ -66402,7 +66402,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sufami">
-		<description>Sufami Turbo (Jpn)</description>
+		<description>Sufami Turbo (Japan)</description>
 		<year>1996</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="snes_cart">
@@ -66414,7 +66414,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="sgboyju" cloneof="sgboy">
-		<description>Super Game Boy (Jpn, USA, Rev. A)</description>
+		<description>Super Game Boy (Japan, USA, Rev. A)</description>
 		<year>199?</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -66438,7 +66438,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="npmenua" cloneof="npmenu">
-		<description>Nintendo Power Menu Program (Jpn, NP)</description>
+		<description>Nintendo Power Menu Program (Japan, NP)</description>
 		<year>199?</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -66450,7 +66450,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="npmenu">
-		<description>Nintendo Power Menu Program (Jpn, Rev. A, NP)</description>
+		<description>Nintendo Power Menu Program (Japan, Rev. A, NP)</description>
 		<year>199?</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="snes_cart">
@@ -66462,7 +66462,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 	</software>
 
 	<software name="agingcas">
-		<description>Aging Cassette (Jpn)</description>
+		<description>Aging Cassette (Japan)</description>
 		<year>199?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="snes_cart">
@@ -66475,7 +66475,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<!-- we shall emulate the additional hardware here... -->
 	<software name="nus64cc" supported="partial">
-		<description>NUS-64 Cassette Checker (Jpn)</description>
+		<description>NUS-64 Cassette Checker (Japan)</description>
 		<year>1997</year>
 		<publisher>Nintendo</publisher>
 		<info name="alt_title" value="Cassette Kensaki - NUS" />
@@ -66489,7 +66489,7 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20
 
 	<!-- we shall emulate the additional hardware here... -->
 	<software name="scd" supported="partial">
-		<description>Super Disc (Jpn, v0.95, prototype)</description>
+		<description>Super Disc (Japan, v0.95, prototype)</description>
 		<year>1992?</year>
 		<publisher>Sony ~ Nintendo</publisher>
 		<part name="cart" interface="snes_cart">