diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index dea907bcd3136..c67bbc5ad9a98 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="245"
-      android:versionName="0.245"
+      android:versionCode="246"
+      android:versionName="0.246"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->
diff --git a/hash/bbc_rom.xml b/hash/bbc_rom.xml
index 58e0d86bd41f4..65e2aab15e84f 100644
--- a/hash/bbc_rom.xml
+++ b/hash/bbc_rom.xml
@@ -4608,7 +4608,7 @@ license:CC0
 		<year>1983</year>
 		<publisher>Electronequip</publisher>
 		<part name="rom1" interface="bbc_rom">
-			<dataarea name="rom" size="v">
+			<dataarea name="rom" size="8192">
 				<rom name="EpsonFX80-1.00.rom" size="8192" crc="60ff9be7" sha1="b9cc33e67033c6b59f9113672ca4f84dea774769"/>
 			</dataarea>
 		</part>
diff --git a/hash/casloopy.xml b/hash/casloopy.xml
index 3d82f9f24bfee..c77d5910a02f1 100644
--- a/hash/casloopy.xml
+++ b/hash/casloopy.xml
@@ -16,21 +16,21 @@ license:CC0
 		<info name="serial" value="XK-401"/>
 		<info name="alt_title" value="あにめらんど"/>
 		<part name="cart" interface="loopy_cart">
-			<dataarea name="rom" size="2097152">
-				<rom name="animelnd.bin" size="2097152" crc="665cd0a2" sha1="8d50867aba721185560fc92bed75c92263a1da39"/>
+			<dataarea name="rom" size="0x200000">
+				<rom name="animelnd.bin" size="0x200000" crc="665cd0a2" sha1="8d50867aba721185560fc92bed75c92263a1da39"/>
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="dreamchg">
-		<description>Dream Change - Kogane-chan no Fashion Party</description>
+		<description>Dream Change - Kokin-chan no Fashion Party</description>
 		<year>1995</year>
 		<publisher>Casio</publisher>
 		<info name="serial" value="XK-403"/>
 		<info name="alt_title" value="ドリームチェンジ 小金ちゃんのファッションパーティー"/>
 		<part name="cart" interface="loopy_cart">
-			<dataarea name="rom" size="2097152">
-				<rom name="dreamchg.bin" size="2097152" crc="0b850185" sha1="b5d73661ea83167d2b07516c7c66a8a85b28415b"/>
+			<dataarea name="rom" size="0x200000">
+				<rom name="dreamchg.bin" size="0x200000" crc="0b850185" sha1="b5d73661ea83167d2b07516c7c66a8a85b28415b"/>
 			</dataarea>
 		</part>
 	</software>
@@ -42,8 +42,8 @@ license:CC0
 		<info name="serial" value="XK-402"/>
 		<info name="alt_title" value="HARIHARIシールパラダイス"/>
 		<part name="cart" interface="loopy_cart">
-			<dataarea name="rom" size="2097152">
-				<rom name="harihari.bin" size="2097152" crc="39a417d6" sha1="1adbd97181b61a1a65e21976b0146e9dd80fbdbf"/>
+			<dataarea name="rom" size="0x200000">
+				<rom name="harihari.bin" size="0x200000" crc="39a417d6" sha1="1adbd97181b61a1a65e21976b0146e9dd80fbdbf"/>
 			</dataarea>
 		</part>
 	</software>
@@ -55,7 +55,7 @@ license:CC0
 		<info name="serial" value="XK-503"/>
 		<info name="alt_title" value="リトルロマンス"/>
 		<part name="cart" interface="loopy_cart">
-			<dataarea name="rom" size="0x3000000">
+			<dataarea name="rom" size="0x300000">
 				<rom name="d23c16000.ic104" size="0x200000" crc="947a96c3" sha1="df27293c136420d4c21724517953510292319433" offset="0x000000" />
 				<rom name="d23c8000.ic105" size="0x100000" crc="a868e597" sha1="87226d26dbb3a95ce8f75a595bd874af6e5cb17b" offset="0x200000" />
 			</dataarea>
@@ -69,8 +69,8 @@ license:CC0
 		<info name="serial" value="XK-404"/>
 		<info name="alt_title" value="似顔絵アーティスト"/>
 		<part name="cart" interface="loopy_cart">
-			<dataarea name="rom" size="2097152">
-				<rom name="nigaoart.bin" size="2097152" crc="63d59881" sha1="d2b830acf8440e4726e851514d609700375b27db"/>
+			<dataarea name="rom" size="0x200000">
+				<rom name="nigaoart.bin" size="0x200000" crc="63d59881" sha1="d2b830acf8440e4726e851514d609700375b27db"/>
 			</dataarea>
 		</part>
 	</software>
@@ -82,8 +82,8 @@ license:CC0
 		<info name="serial" value="XK-501"/>
 		<info name="alt_title" value="わんわん愛情物語"/>
 		<part name="cart" interface="loopy_cart">
-			<dataarea name="rom" size="2097152">
-				<rom name="wanwanam.bin" size="2097152" crc="291ab2bc" sha1="77a63cf194c5b06633e25b43916629b6f3428870"/>
+			<dataarea name="rom" size="0x200000">
+				<rom name="wanwanam.bin" size="0x200000" crc="291ab2bc" sha1="77a63cf194c5b06633e25b43916629b6f3428870"/>
 			</dataarea>
 		</part>
 	</software>
@@ -95,8 +95,8 @@ license:CC0
 		<info name="serial" value="XK-502"/>
 		<info name="alt_title" value="パソコン・コレクション"/>
 		<part name="cart" interface="loopy_cart">
-			<dataarea name="rom" size="2097152">
-				<rom name="pccllect.bin" size="2097152" crc="9cd4d282" sha1="15ac5a8e71fc8371505da8368d04c9634655d1d5"/>
+			<dataarea name="rom" size="0x200000">
+				<rom name="pccllect.bin" size="0x200000" crc="9cd4d282" sha1="15ac5a8e71fc8371505da8368d04c9634655d1d5"/>
 			</dataarea>
 		</part>
 	</software>
diff --git a/hash/coco_cart.xml b/hash/coco_cart.xml
index dfc0d1d4a90bc..3ec76422206a8 100644
--- a/hash/coco_cart.xml
+++ b/hash/coco_cart.xml
@@ -451,7 +451,7 @@ Compiled by K1W1 and Cowering (from GoodCoCo)
 		<info name="developer" value="The Image Producers" />
 		<info name="serial" value="26-3082" />
 		<part name="cart" interface="coco_cart">
-			<dataarea name="rom" size="4097">
+			<dataarea name="rom" size="4096">
 				<rom name="crosswords (1981) (26-3082) (the image producers).rom" size="4096" crc="06075f2a" sha1="949cac570d8ccb6cea0ed565d420f3198e2f1c64"/>
 			</dataarea>
 		</part>
diff --git a/hash/nes.xml b/hash/nes.xml
index 0cfb4e213f486..c1594b236f851 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -36,9 +36,9 @@ license:CC0
 -->
 
 	<software name="89denku">
-		<description>'89 Dennou Kyuusei Uranai (Jpn)</description>
+		<description>'89 Dennou Kyuusei Uranai by Jingūkan (Japan)</description>
 		<year>1988</year>
-		<publisher>Jingukan</publisher>
+		<publisher>Induction Produce</publisher>
 		<info name="serial" value="IPC-J1-01"/>
 		<info name="release" value="19881210"/>
 		<info name="alt_title" value="神宮館'89電脳九星占い"/>
@@ -56,7 +56,7 @@ license:CC0
 	</software>
 
 	<software name="10yardj1" cloneof="10yard">
-		<description>10-Yard Fight (Jpn)</description>
+		<description>10-Yard Fight (Japan)</description>
 		<year>1985</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-02"/>
@@ -77,7 +77,7 @@ license:CC0
 	</software>
 
 	<software name="10yardj" cloneof="10yard">
-		<description>10-Yard Fight (Jpn, v1.1)</description>
+		<description>10-Yard Fight (Japan, v1.1)</description>
 		<year>1985</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-02"/>
@@ -122,7 +122,7 @@ license:CC0
 	</software>
 
 	<software name="1942">
-		<description>1942 (Jpn, USA)</description>
+		<description>1942 (Japan, USA)</description>
 		<year>1985</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-19, NES-NF-USA"/>
@@ -160,7 +160,7 @@ license:CC0
 	</software>
 
 	<software name="1943j" cloneof="1943">
-		<description>1943 - The Battle of Valhalla (Jpn)</description>
+		<description>1943 - The Battle of Valhalla (Japan)</description>
 		<year>1988</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-43"/>
@@ -179,7 +179,7 @@ license:CC0
 	</software>
 
 	<software name="sf2010j" cloneof="sf2010">
-		<description>2010 Street Fighter (Jpn)</description>
+		<description>2010 Street Fighter (Japan)</description>
 		<year>1990</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="STE-20"/>
@@ -297,7 +297,7 @@ license:CC0
 	</software>
 
 	<software name="8eyesj" cloneof="8eyes">
-		<description>8 Eyes (Jpn)</description>
+		<description>8 Eyes (Japan)</description>
 		<year>1988</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="KKS-8E (03)"/>
@@ -336,7 +336,7 @@ license:CC0
 	</software>
 
 	<software name="ayji">
-		<description>Aa Yakyuu Jinsei Icchokusen (Jpn)</description>
+		<description>Aa Yakyuu Jinsei Icchokusen (Japan)</description>
 		<year>1992</year>
 		<publisher>Sammy</publisher>
 		<info name="serial" value="SAC-YA"/>
@@ -778,7 +778,7 @@ license:CC0
 	</software>
 
 	<software name="loloj" cloneof="lolo2">
-		<description>Adventures of Lolo (Jpn)</description>
+		<description>Adventures of Lolo (Japan)</description>
 		<year>1990</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-A4"/>
@@ -836,7 +836,7 @@ license:CC0
 	</software>
 
 	<software name="lolo2j" cloneof="lolo3">
-		<description>Adventures of Lolo II (Jpn)</description>
+		<description>Adventures of Lolo II (Japan)</description>
 		<year>1990</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-QL"/>
@@ -1008,7 +1008,7 @@ license:CC0
 	</software>
 
 	<software name="aburnerj" cloneof="aburner">
-		<description>After Burner II (Jpn)</description>
+		<description>After Burner II (Japan)</description>
 		<year>1989</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-AFB-6200 (SS13)"/>
@@ -1028,7 +1028,7 @@ license:CC0
 	</software>
 
 	<software name="aburnerj1" cloneof="aburner">
-		<description>After Burner II (Jpn, alt PCB)</description>
+		<description>After Burner II (Japan, alt PCB)</description>
 		<year>1989</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-AFB-6200 (SS13)"/>
@@ -1066,7 +1066,7 @@ license:CC0
 	</software>
 
 	<software name="balubalo">
-		<description>Aigiina no Yogen - from "The Legend of Balubalouk" (Jpn)</description>
+		<description>Aigiina no Yogen - from "The Legend of Balubalouk" (Japan)</description>
 		<year>1986</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="VIC-AY"/>
@@ -1129,7 +1129,7 @@ license:CC0
 	</software>
 
 	<software name="airwolfj">
-		<description>Airwolf (Jpn)</description>
+		<description>Airwolf (Japan)</description>
 		<year>1988</year>
 		<publisher>Kyugo Boueki</publisher>
 		<info name="serial" value="KYG-AX"/>
@@ -1186,8 +1186,9 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="ajyureir">
-		<description>Akagawa Jirou no Yuurei Ressha (Jpn)</description>
+<!-- Game has no sound. Could this be related to sound issue in early Enix games? -->
+	<software name="ajyureir" supported="no">
+		<description>Akagawa Jirou no Yuurei Ressha (Japan)</description>
 		<year>1991</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="KIN-YU"/>
@@ -1211,7 +1212,7 @@ license:CC0
 	</software>
 
 	<software name="akira" supported="no">
-		<description>Akira (Jpn)</description>
+		<description>Akira (Japan)</description>
 		<year>1988</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-AK-6800 (21)"/>
@@ -1231,7 +1232,7 @@ license:CC0
 	</software>
 
 	<software name="akumasho" cloneof="uninvite">
-		<description>Akuma no Shoutaijou (Jpn)</description>
+		<description>Akuma no Shoutaijou (Japan)</description>
 		<year>1989</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-UV"/>
@@ -1255,7 +1256,7 @@ license:CC0
 	</software>
 
 	<software name="akumakun">
-		<description>Akuma-kun - Makai no Wana (Jpn)</description>
+		<description>Akuma-kun - Makai no Wana (Japan)</description>
 		<year>1990</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-AKUMA"/>
@@ -1274,7 +1275,7 @@ license:CC0
 	</software>
 
 	<software name="akumaden" cloneof="cvania3">
-		<description>Akumajou Densetsu (Jpn)</description>
+		<description>Akumajou Densetsu (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC845"/>
@@ -1295,7 +1296,7 @@ license:CC0
 	</software>
 
 	<software name="akumajo" cloneof="cvania">
-		<description>Akumajou Dracula (Jpn)</description>
+		<description>Akumajou Dracula (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RV003"/>
@@ -1315,7 +1316,7 @@ license:CC0
 	</software>
 
 	<software name="akumaspc">
-		<description>Akumajou Special - Boku Dracula-kun (Jpn)</description>
+		<description>Akumajou Special - Boku Dracula-kun (Japan)</description>
 		<year>1990</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC847"/>
@@ -1528,7 +1529,7 @@ license:CC0
 	</software>
 
 	<software name="ameridai">
-		<description>America Daitouryou Senkyo (Jpn)</description>
+		<description>America Daitouryou Senkyo (Japan)</description>
 		<year>1988</year>
 		<publisher>Hector</publisher>
 		<info name="serial" value="HCT-AQ/002"/>
@@ -1552,7 +1553,7 @@ license:CC0
 	</software>
 
 	<software name="amoudan">
-		<description>America Oudan Ultra Quiz - Shijou Saidai no Tatakai (Jpn)</description>
+		<description>America Oudan Ultra Quiz - Shijou Saidai no Tatakai (Japan)</description>
 		<year>1991</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="TOM-1U"/>
@@ -1572,7 +1573,7 @@ license:CC0
 	</software>
 
 	<software name="ameridrm">
-		<description>American Dream (Jpn)</description>
+		<description>American Dream (Japan)</description>
 		<year>1989</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-A7"/>
@@ -1592,7 +1593,7 @@ license:CC0
 	</software>
 
 	<software name="tdfeverj" cloneof="tdfever">
-		<description>Touchdown Fever (Jpn)</description>
+		<description>Touchdown Fever (Japan)</description>
 		<year>1988</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="KAC-T7"/>
@@ -1631,7 +1632,7 @@ license:CC0
 	</software>
 
 	<software name="ankokush">
-		<description>Ankoku Shinwa - Yamato Takeru Densetsu (Jpn)</description>
+		<description>Ankoku Shinwa - Yamato Takeru Densetsu (Japan)</description>
 		<year>1989</year>
 		<publisher>Tokyo Shoseki</publisher>
 		<info name="serial" value="TKS-G6"/>
@@ -1651,7 +1652,7 @@ license:CC0
 	</software>
 
 	<software name="antarct1" cloneof="antarct">
-		<description>Antarctic Adventure ~ Kekkyoku Nankyoku Daibouken (Jpn)</description>
+		<description>Antarctic Adventure ~ Kekkyoku Nankyoku Daibouken (Japan)</description>
 		<year>1985</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC804"/>
@@ -1672,7 +1673,7 @@ license:CC0
 	</software>
 
 	<software name="antarct">
-		<description>Antarctic Adventure ~ Kekkyoku Nankyoku Daibouken (Jpn, v1.1)</description>
+		<description>Antarctic Adventure ~ Kekkyoku Nankyoku Daibouken (Japan, v1.1)</description>
 		<year>1985</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC804"/>
@@ -1731,7 +1732,7 @@ license:CC0
 	</software>
 
 	<software name="genchohi">
-		<description>Aoki Ookami to Shiroki Mejika - Genchou Hishi (Jpn)</description>
+		<description>Aoki Ookami to Shiroki Mejika - Genchou Hishi (Japan)</description>
 		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-GG"/>
@@ -1757,7 +1758,7 @@ license:CC0
 	</software>
 
 	<software name="genghisj" cloneof="genghis">
-		<description>Aoki Ookami to Shiroki Mejika - Genghis Khan (Jpn)</description>
+		<description>Aoki Ookami to Shiroki Mejika - Genghis Khan (Japan)</description>
 		<year>1989</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-GX"/>
@@ -1784,7 +1785,7 @@ license:CC0
 	</software>
 
 	<software name="arabndrm" cloneof="magicsch">
-		<description>Arabian Dream Scheherazade (Jpn)</description>
+		<description>Arabian Dream Scheherazade (Japan)</description>
 		<year>1987</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="CBF-AS"/>
@@ -1860,7 +1861,7 @@ license:CC0
 	</software>
 
 	<software name="rygarj" cloneof="rygar">
-		<description>Argos no Senshi - Hachamecha Daishingeki (Jpn)</description>
+		<description>Argos no Senshi - Hachamecha Daishingeki (Japan)</description>
 		<year>1987</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-AH"/>
@@ -1880,7 +1881,7 @@ license:CC0
 	</software>
 
 	<software name="argus">
-		<description>Argus (Jpn)</description>
+		<description>Argus (Japan)</description>
 		<year>1986</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-07"/>
@@ -1900,7 +1901,7 @@ license:CC0
 	</software>
 
 	<software name="arkanoidj" cloneof="arkanoid">
-		<description>Arkanoid (Jpn)</description>
+		<description>Arkanoid (Japan)</description>
 		<year>1986</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-AN-5400 (10)"/>
@@ -1941,7 +1942,7 @@ license:CC0
 	</software>
 
 	<software name="arknoid2">
-		<description>Arkanoid II (Jpn)</description>
+		<description>Arkanoid II (Japan)</description>
 		<year>1988</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-ANII-5900 (16)"/>
@@ -1981,7 +1982,7 @@ license:CC0
 	</software>
 
 	<software name="armadill">
-		<description>Armadillo (Jpn)</description>
+		<description>Armadillo (Japan)</description>
 		<year>1991</year>
 		<publisher>IGS</publisher>
 		<info name="serial" value="IGS-9T"/>
@@ -2002,7 +2003,7 @@ license:CC0
 	</software>
 
 	<software name="artelius">
-		<description>Artelius (Jpn)</description>
+		<description>Artelius (Japan)</description>
 		<year>1987</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-AU (06)"/>
@@ -2026,12 +2027,12 @@ license:CC0
 	</software>
 
 	<software name="aso" cloneof="alphamis">
-		<description>ASO - Armored Scrum Object (Jpn)</description>
+		<description>ASO - Armored Scrum Object (Japan)</description>
 		<year>1986</year>
 		<publisher>SNK</publisher>
 		<info name="serial" value="SFX-AO"/>
 		<info name="release" value="19860903"/>
-		<info name="alt_title" value="エー エス オー"/>
+		<info name="alt_title" value="エー・エス・オー"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="cnrom" />
 			<feature name="pcb" value="HVC-CNROM" />
@@ -2046,7 +2047,7 @@ license:CC0
 	</software>
 
 	<software name="astrofng">
-		<description>Astro Fang - Super Machine (Jpn)</description>
+		<description>Astro Fang - Super Machine (Japan)</description>
 		<year>1990</year>
 		<publisher>A-Wave</publisher>
 		<info name="serial" value="WAV-E1 (01)"/>
@@ -2066,7 +2067,7 @@ license:CC0
 	</software>
 
 	<software name="robosasa">
-		<description>Astro Robo SASA (Jpn)</description>
+		<description>Astro Robo SASA (Japan)</description>
 		<year>1985</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-01"/>
@@ -2161,7 +2162,7 @@ license:CC0
 	</software>
 
 	<software name="athenaj" cloneof="athena">
-		<description>Athena (Jpn)</description>
+		<description>Athena (Japan)</description>
 		<year>1987</year>
 		<publisher>SNK</publisher>
 		<info name="serial" value="SFX-AT"/>
@@ -2221,7 +2222,7 @@ license:CC0
 	</software>
 
 	<software name="atlantis">
-		<description>Atlantis no Nazo (Jpn)</description>
+		<description>Atlantis no Nazo (Japan)</description>
 		<year>1986</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-ATL-4900 (SS4)"/>
@@ -2241,7 +2242,7 @@ license:CC0
 	</software>
 
 	<software name="atlantisp" cloneof="atlantis">
-		<description>Atlantis no Nazo (Jpn, sample)</description>
+		<description>Atlantis no Nazo (Japan, sample)</description>
 		<year>1986</year>
 		<publisher>Sunsoft</publisher>
 		<part name="cart" interface="nes_cart">
@@ -2258,7 +2259,7 @@ license:CC0
 	</software>
 
 	<software name="animalgk">
-		<description>Attack Animal Gakuen (Jpn)</description>
+		<description>Attack Animal Gakuen (Japan)</description>
 		<year>1987</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-AA (R55V5913)"/>
@@ -2336,7 +2337,7 @@ license:CC0
 	</software>
 
 	<software name="bwings">
-		<description>B-Wings (Jpn)</description>
+		<description>B-Wings (Japan)</description>
 		<year>1986</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-BW"/>
@@ -2358,7 +2359,7 @@ license:CC0
 	</software>
 
 	<software name="babeltou">
-		<description>Babel no Tou (Jpn)</description>
+		<description>Babel no Tou (Japan)</description>
 		<year>1986</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NBL-3900 (16)"/>
@@ -2511,7 +2512,7 @@ license:CC0
 	</software>
 
 	<software name="gatein">
-		<description>Baken Hisshou Gaku - Gate In (Jpn)</description>
+		<description>Baken Hisshou Gaku - Gate In (Japan)</description>
 		<year>1990</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="KAC-3F"/>
@@ -2531,7 +2532,7 @@ license:CC0
 	</software>
 
 	<software name="bakuaig">
-		<description>Bakushou! Ai no Gekijou (Jpn)</description>
+		<description>Bakushou! Ai no Gekijou (Japan)</description>
 		<year>1990</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-IA"/>
@@ -2551,7 +2552,7 @@ license:CC0
 	</software>
 
 	<software name="monomane">
-		<description>Bakushou! Star Monomane Shitennou (Jpn)</description>
+		<description>Bakushou! Star Monomane Shitennou (Japan)</description>
 		<year>1990</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="PAC-8M"/>
@@ -2571,7 +2572,7 @@ license:CC0
 	</software>
 
 	<software name="bakujing">
-		<description>Bakushou!! Jinsei Gekijou (Jpn)</description>
+		<description>Bakushou!! Jinsei Gekijou (Japan)</description>
 		<year>1989</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-BZG-5900 (23)"/>
@@ -2590,7 +2591,7 @@ license:CC0
 	</software>
 
 	<software name="bakujin2">
-		<description>Bakushou!! Jinsei Gekijou 2 (Jpn)</description>
+		<description>Bakushou!! Jinsei Gekijou 2 (Japan)</description>
 		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-BJ2-5900 (35)"/>
@@ -2609,7 +2610,7 @@ license:CC0
 	</software>
 
 	<software name="bakujin3">
-		<description>Bakushou!! Jinsei Gekijou 3 (Jpn)</description>
+		<description>Bakushou!! Jinsei Gekijou 3 (Japan)</description>
 		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-BJIII-6400 (40)"/>
@@ -2628,7 +2629,7 @@ license:CC0
 	</software>
 
 	<software name="ballblaz">
-		<description>Ballblazer (Jpn)</description>
+		<description>Ballblazer (Japan)</description>
 		<year>1988</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-BZ (R55V5911)"/>
@@ -2648,7 +2649,7 @@ license:CC0
 	</software>
 
 	<software name="balonfgtj" cloneof="balonfgt">
-		<description>Balloon Fight (Jpn)</description>
+		<description>Balloon Fight (Japan)</description>
 		<year>1985</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-BF"/>
@@ -2895,7 +2896,7 @@ license:CC0
 	</software>
 
 	<software name="brdtalej" cloneof="brdtale">
-		<description>The Bard's Tale - Tales of the Unknown (Jpn)</description>
+		<description>The Bard's Tale - Tales of the Unknown (Japan)</description>
 		<year>1990</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-ET (R68V5935)"/>
@@ -2942,7 +2943,7 @@ license:CC0
 	</software>
 
 	<software name="brdtale2">
-		<description>The Bard's Tale II - The Destiny Knight (Jpn)</description>
+		<description>The Bard's Tale II - The Destiny Knight (Japan)</description>
 		<year>1992</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-4I (R70V5940)"/>
@@ -3029,7 +3030,7 @@ license:CC0
 	</software>
 
 	<software name="baseballj" cloneof="baseball">
-		<description>Baseball (Jpn)</description>
+		<description>Baseball (Japan)</description>
 		<year>1983</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-BA"/>
@@ -3050,7 +3051,7 @@ license:CC0
 	</software>
 
 	<software name="baseballj1" cloneof="baseball">
-		<description>Baseball (Jpn, STROM PCB)</description>
+		<description>Baseball (Japan, STROM PCB)</description>
 		<year>1983</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-BA"/>
@@ -3116,7 +3117,7 @@ license:CC0
 	</software>
 
 	<software name="bstarsj" cloneof="bstars">
-		<description>Baseball Star - Mezase Sankanou!! (Jpn)</description>
+		<description>Baseball Star - Mezase Sankanou!! (Japan)</description>
 		<year>1989</year>
 		<publisher>SNK</publisher>
 		<info name="serial" value="SFX-B9"/>
@@ -3305,7 +3306,7 @@ license:CC0
 	</software>
 
 	<software name="batmanj" cloneof="batman">
-		<description>Batman (Jpn)</description>
+		<description>Batman (Japan)</description>
 		<year>1989</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-BAT-6200"/>
@@ -3487,7 +3488,7 @@ license:CC0
 	</software>
 
 	<software name="batsuter">
-		<description>Batsu &amp; Terii - Makyou no Tetsujin Race (Jpn)</description>
+		<description>Batsu &amp; Terii - Makyou no Tetsujin Race (Japan)</description>
 		<year>1987</year>
 		<publisher>Use</publisher>
 		<info name="serial" value="USE-BC"/>
@@ -3526,7 +3527,7 @@ license:CC0
 	</software>
 
 	<software name="batlcity">
-		<description>Battle City (Jpn)</description>
+		<description>Battle City (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NBC-4500 (09)"/>
@@ -3547,7 +3548,7 @@ license:CC0
 	</software>
 
 	<software name="bfleet">
-		<description>Battle Fleet (Jpn)</description>
+		<description>Battle Fleet (Japan)</description>
 		<year>1990</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FBF-5900"/>
@@ -3571,7 +3572,7 @@ license:CC0
 	</software>
 
 	<software name="bformula" cloneof="sspyhunt">
-		<description>Battle Formula (Jpn)</description>
+		<description>Battle Formula (Japan)</description>
 		<year>1991</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="TEC-5U"/>
@@ -3591,12 +3592,12 @@ license:CC0
 	</software>
 
 	<software name="batlstad">
-		<description>Battle Stadium - Senbatsu Pro Yakyuu (Jpn)</description>
+		<description>Battle Stadium - Senbatsu Pro Yakyuu (Japan)</description>
 		<year>1990</year>
 		<publisher>IGS</publisher>
 		<info name="serial" value="IGS-X8"/>
 		<info name="release" value="19901220"/>
-		<info name="alt_title" value="バトルスタジアム"/>
+		<info name="alt_title" value="バトルスタジアム 選抜プロ野球"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="sxrom" />
 			<feature name="pcb" value="HVC-SKROM" />
@@ -3616,7 +3617,7 @@ license:CC0
 	</software>
 
 	<software name="battlest">
-		<description>Battle Storm (Jpn)</description>
+		<description>Battle Storm (Japan)</description>
 		<year>1991</year>
 		<publisher>Yonezawa</publisher>
 		<info name="serial" value="YZW-9Y"/>
@@ -3735,7 +3736,7 @@ license:CC0
 	</software>
 
 	<software name="btoadsj" cloneof="btoads">
-		<description>Battletoads (Jpn)</description>
+		<description>Battletoads (Japan)</description>
 		<year>1991</year>
 		<publisher>Masaya</publisher>
 		<info name="serial" value="NCS-8T"/>
@@ -3837,7 +3838,7 @@ license:CC0
 	</software>
 
 	<software name="bebophs">
-		<description>Be-Bop High School - Koukousei Gokuraku Densetsu (Jpn)</description>
+		<description>Be-Bop High School - Koukousei Gokuraku Densetsu (Japan)</description>
 		<year>1988</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-EP"/>
@@ -4286,7 +4287,7 @@ license:CC0
 	</software>
 
 	<software name="harukinm" cloneof="crashn">
-		<description>Bikkuri Nekketsu Shin Kiroku! Harukanaru Kin Medal (Jpn)</description>
+		<description>Bikkuri Nekketsu Shin Kiroku! Harukanaru Kin Medal (Japan)</description>
 		<year>1992</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-NK"/>
@@ -4306,7 +4307,7 @@ license:CC0
 	</software>
 
 	<software name="bikkuri">
-		<description>Bikkuriman World - Gekitou Sei Senshi (Jpn)</description>
+		<description>Bikkuriman World - Gekitou Sei Senshi (Japan)</description>
 		<year>1990</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-V3"/>
@@ -4371,7 +4372,7 @@ license:CC0
 	</software>
 
 	<software name="binary">
-		<description>Binary Land (Jpn)</description>
+		<description>Binary Land (Japan)</description>
 		<year>1985</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-BI"/>
@@ -4392,7 +4393,7 @@ license:CC0
 	</software>
 
 	<software name="biomirac">
-		<description>Bio Miracle Bokutte Upa (Jpn)</description>
+		<description>Bio Miracle Bokutte Upa (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RV102"/>
@@ -4413,7 +4414,7 @@ license:CC0
 	</software>
 
 	<software name="biosdan" cloneof="bashibaz">
-		<description>Bio Senshi Dan - Increaser tono Tatakai (Jpn)</description>
+		<description>Bio Senshi Dan - Increaser to no Tatakai (Japan)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-14"/>
@@ -4477,7 +4478,7 @@ license:CC0
 	</software>
 
 	<software name="birdweek">
-		<description>Bird Week (Jpn)</description>
+		<description>Bird Week (Japan)</description>
 		<year>1986</year>
 		<publisher>Toemiland</publisher>
 		<info name="serial" value="TFS-BK"/>
@@ -4667,7 +4668,7 @@ license:CC0
 	</software>
 
 	<software name="blodia">
-		<description>Blodia Land - Puzzle Quest (Jpn)</description>
+		<description>Blodia Land - Puzzle Quest (Japan)</description>
 		<year>1990</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="TKS-XF"/>
@@ -4687,12 +4688,13 @@ license:CC0
 	</software>
 
 	<software name="bloodwar">
-		<description>Bloody Warriors - Shan-Go no Gyakushuu (Jpn)</description>
+		<description>Bloody Warriors - Shan-Go no Gyakushuu (Japan)</description>
 		<year>1990</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-94"/>
 		<info name="release" value="19901019"/>
-		<info name="alt_title" value="ブラッディ ウォーリアーズ シャンゴーの逆襲"/>
+		<info name="alt_title" value="ブラッディ ウァリアーズ シャンゴーの逆襲"/>
+		<info name="alt_title" value="Bloody Warriors - Shan-Go Troop Strikes Back!"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="sxrom" />
 			<feature name="pcb" value="HVC-SNROM" />
@@ -4808,7 +4810,7 @@ license:CC0
 	</software>
 
 	<software name="bokosuka">
-		<description>Bokosuka Wars (Jpn)</description>
+		<description>Bokosuka Wars (Japan)</description>
 		<year>1985</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-04"/>
@@ -4828,7 +4830,7 @@ license:CC0
 	</software>
 
 	<software name="bombking" cloneof="robowarr">
-		<description>Bomber King (Jpn)</description>
+		<description>Bomber King (Japan)</description>
 		<year>1987</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-BX"/>
@@ -4848,7 +4850,7 @@ license:CC0
 	</software>
 
 	<software name="bombmanj" cloneof="bombman">
-		<description>Bomberman (Jpn)</description>
+		<description>Bomberman (Japan)</description>
 		<year>1985</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-BM"/>
@@ -4889,7 +4891,7 @@ license:CC0
 	</software>
 
 	<software name="bombman2j" cloneof="dynablas">
-		<description>Bomberman II (Jpn)</description>
+		<description>Bomberman II (Japan)</description>
 		<year>1991</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-2X"/>
@@ -4953,7 +4955,7 @@ license:CC0
 	</software>
 
 	<software name="boobkids">
-		<description>Booby Kids (Jpn)</description>
+		<description>Booby Kids (Japan)</description>
 		<year>1987</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-BB (05)"/>
@@ -4973,7 +4975,7 @@ license:CC0
 	</software>
 
 	<software name="bdashj" cloneof="bdash">
-		<description>Boulder Dash (Jpn)</description>
+		<description>Boulder Dash (Japan)</description>
 		<year>1990</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-XB"/>
@@ -5225,7 +5227,7 @@ license:CC0
 	</software>
 
 	<software name="buckyj" cloneof="bucky">
-		<description>Bucky O'Hare (Jpn)</description>
+		<description>Bucky O'Hare (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-1V"/>
@@ -5283,7 +5285,7 @@ license:CC0
 	</software>
 
 	<software name="buggypop" cloneof="bnj">
-		<description>Buggy Popper (Jpn)</description>
+		<description>Buggy Popper (Japan)</description>
 		<year>1986</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-BP"/>
@@ -5391,7 +5393,7 @@ license:CC0
 	</software>
 
 	<software name="buraij" cloneof="burai">
-		<description>Burai Fighter (Jpn)</description>
+		<description>Burai Fighter (Japan)</description>
 		<year>1990</year>
 		<publisher>Taito / Disco</publisher>
 		<info name="serial" value="DTF-5F (32)"/>
@@ -5448,7 +5450,7 @@ license:CC0
 	</software>
 
 	<software name="btimej" cloneof="btime">
-		<description>BurgerTime (Jpn)</description>
+		<description>BurgerTime (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NBT-4500 (11)"/>
@@ -5507,7 +5509,7 @@ license:CC0
 	</software>
 
 	<software name="cadillac">
-		<description>Cadillac (Jpn)</description>
+		<description>Cadillac (Japan)</description>
 		<year>1990</year>
 		<publisher>Hector</publisher>
 		<info name="serial" value="HCT-C5/007"/>
@@ -5709,7 +5711,7 @@ license:CC0
 	</software>
 
 	<software name="capted">
-		<description>Captain Ed (Jpn)</description>
+		<description>Captain Ed (Japan)</description>
 		<year>1989</year>
 		<publisher>CBS / Sony Group</publisher>
 		<info name="serial" value="CBS-ED"/>
@@ -5767,7 +5769,7 @@ license:CC0
 	</software>
 
 	<software name="captsilv">
-		<description>Captain Silver (Jpn)</description>
+		<description>Captain Silver (Japan)</description>
 		<year>1988</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="GTS-CK"/>
@@ -5978,7 +5980,7 @@ license:CC0
 	</software>
 
 	<software name="castlex" cloneof="castlqst">
-		<description>Castle Excellent (Jpn)</description>
+		<description>Castle Excellent (Japan)</description>
 		<year>1986</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-05"/>
@@ -5999,7 +6001,7 @@ license:CC0
 	</software>
 
 	<software name="castleq">
-		<description>Castle Quest (Jpn)</description>
+		<description>Castle Quest (Japan)</description>
 		<year>1990</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-V4"/>
@@ -6218,7 +6220,7 @@ license:CC0
 	</software>
 
 	<software name="chackn">
-		<description>Chack'n Pop (Jpn)</description>
+		<description>Chack'n Pop (Japan)</description>
 		<year>1985</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-CP-4500 (02)"/>
@@ -6257,7 +6259,7 @@ license:CC0
 	</software>
 
 	<software name="challngr">
-		<description>Challenger (Jpn)</description>
+		<description>Challenger (Japan)</description>
 		<year>1985</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-CH"/>
@@ -6277,7 +6279,7 @@ license:CC0
 	</software>
 
 	<software name="champbwlj" cloneof="champbwl">
-		<description>Championship Bowling (Jpn)</description>
+		<description>Championship Bowling (Japan)</description>
 		<year>1991</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="ATH-8B"/>
@@ -6316,7 +6318,7 @@ license:CC0
 	</software>
 
 	<software name="cloderun">
-		<description>Championship Lode Runner (Jpn)</description>
+		<description>Championship Lode Runner (Japan)</description>
 		<year>1985</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-CR"/>
@@ -6549,7 +6551,7 @@ license:CC0
 	</software>
 
 	<software name="chiyonof">
-		<description>Chiyonofuji no Ooichou (Jpn)</description>
+		<description>Chiyonofuji no Ooichou (Japan)</description>
 		<year>1990</year>
 		<publisher>Face</publisher>
 		<info name="serial" value="FAC-EJ"/>
@@ -6674,7 +6676,7 @@ license:CC0
 	</software>
 
 	<software name="choplifta" cloneof="choplift">
-		<description>Choplifter (Jpn)</description>
+		<description>Choplifter (Japan)</description>
 		<year>1986</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-08"/>
@@ -6694,7 +6696,7 @@ license:CC0
 	</software>
 
 	<software name="warwolf" cloneof="werewolf">
-		<description>Chou Jinrou Senki - Warwolf (Jpn)</description>
+		<description>Chou Jinrou Senki - Warwolf (Japan)</description>
 		<year>1991</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="TFC-W8"/>
@@ -6714,7 +6716,7 @@ license:CC0
 	</software>
 
 	<software name="metafght" cloneof="bmaster">
-		<description>Chou Wakusei Senki - Metafight (Jpn)</description>
+		<description>Chou Wakusei Senki - Metafight (Japan)</description>
 		<year>1988</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="TEC-MF"/>
@@ -6734,7 +6736,7 @@ license:CC0
 	</software>
 
 	<software name="macross">
-		<description>Choujikuu Yousai Macross (Jpn)</description>
+		<description>Choujikuu Yousai Macross (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NMR-4500"/>
@@ -6755,7 +6757,7 @@ license:CC0
 	</software>
 
 	<software name="ultrabb" cloneof="basesim">
-		<description>Choujin - Ultra Baseball (Jpn)</description>
+		<description>Choujin - Ultra Baseball (Japan)</description>
 		<year>1989</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="CBF-UB"/>
@@ -6798,7 +6800,7 @@ license:CC0
 	</software>
 
 	<software name="chukatai">
-		<description>Chuka Taisen (Jpn)</description>
+		<description>Chuka Taisen (Japan)</description>
 		<year>1989</year>
 		<publisher>Taito / Disco</publisher>
 		<info name="serial" value="DTF-CW (27)"/>
@@ -6817,13 +6819,13 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="tonpuu">
-		<description>Chuugoku Janshi Story - Tonpuu (Jpn)</description>
+	<software name="tonfuu">
+		<description>Chuugoku Janshi Story - Tonfuu (Japan)</description>
 		<year>1989</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="NAT-T8"/>
 		<info name="release" value="19891223"/>
-		<info name="alt_title" value="中国雀士ストーリー 東風"/>
+		<info name="alt_title" value="中国雀士物語・東風"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="sxrom" />
 			<feature name="pcb" value="HVC-SLROM" />
@@ -6838,7 +6840,7 @@ license:CC0
 	</software>
 
 	<software name="chuugoks">
-		<description>Chuugoku Senseijutsu (Jpn)</description>
+		<description>Chuugoku Senseijutsu (Japan)</description>
 		<year>1988</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="SAN-CQ"/>
@@ -6877,7 +6879,7 @@ license:CC0
 	</software>
 
 	<software name="circusc">
-		<description>Circus Charlie (Jpn)</description>
+		<description>Circus Charlie (Japan)</description>
 		<year>1986</year>
 		<publisher>Soft Pro</publisher>
 		<info name="serial" value="SFC-CC"/>
@@ -6898,7 +6900,7 @@ license:CC0
 	</software>
 
 	<software name="touch">
-		<description>City Adventure Touch - Mystery of Triangle (Jpn)</description>
+		<description>City Adventure Touch - Mystery of Triangle (Japan)</description>
 		<year>1987</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="THF-TU"/>
@@ -6918,7 +6920,7 @@ license:CC0
 	</software>
 
 	<software name="cityconj" cloneof="citycon">
-		<description>City Connection (Jpn)</description>
+		<description>City Connection (Japan)</description>
 		<year>1985</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-05"/>
@@ -7055,7 +7057,7 @@ license:CC0
 	</software>
 
 	<software name="cobracomj" cloneof="cobracom">
-		<description>Cobra Command (Jpn)</description>
+		<description>Cobra Command (Japan)</description>
 		<year>1988</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-CN"/>
@@ -7230,7 +7232,7 @@ license:CC0
 	</software>
 
 	<software name="conflictj" cloneof="conflict">
-		<description>Conflict (Jpn)</description>
+		<description>Conflict (Japan)</description>
 		<year>1989</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="VIC-C3"/>
@@ -7272,7 +7274,7 @@ license:CC0
 	</software>
 
 	<software name="contraj" cloneof="probot">
-		<description>Contra (Jpn)</description>
+		<description>Contra (Japan)</description>
 		<year>1988</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC826"/>
@@ -7376,7 +7378,7 @@ license:CC0
 	</software>
 
 	<software name="cepsilon">
-		<description>Cosmic Epsilon (Jpn)</description>
+		<description>Cosmic Epsilon (Japan)</description>
 		<year>1989</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="ASM-EO"/>
@@ -7414,7 +7416,7 @@ license:CC0
 	</software>
 
 	<software name="cosmwars">
-		<description>Cosmic Wars (Jpn)</description>
+		<description>Cosmic Wars (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-CJ"/>
@@ -7438,7 +7440,7 @@ license:CC0
 	</software>
 
 	<software name="cosmogen" cloneof="starvoyg">
-		<description>Cosmo Genesis (Jpn)</description>
+		<description>Cosmo Genesis (Japan)</description>
 		<year>1986</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-06"/>
@@ -7531,7 +7533,7 @@ license:CC0
 	</software>
 
 	<software name="crayon">
-		<description>Crayon Shin-chan - Ora to Poi Poi (Jpn)</description>
+		<description>Crayon Shin-chan - Ora to Poi Poi (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-SHINCHAN"/>
@@ -7550,7 +7552,7 @@ license:CC0
 	</software>
 
 	<software name="cclimber" supported="partial">
-		<description>Crazy Climber (Jpn)</description>
+		<description>Crazy Climber (Japan)</description>
 		<year>1986</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-CY (04)"/>
@@ -7570,7 +7572,7 @@ license:CC0
 	</software>
 
 	<software name="crisisf">
-		<description>Crisis Force (Jpn)</description>
+		<description>Crisis Force (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC856"/>
@@ -7679,7 +7681,7 @@ license:CC0
 	</software>
 
 	<software name="cyclerc">
-		<description>Cycle Race Roadman - Gekisou!! Nihon Isshuu 4000km (Jpn)</description>
+		<description>Cycle Race Roadman - Gekisou!! Nihon Isshuu 4000km (Japan)</description>
 		<year>1988</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="TKS-G7"/>
@@ -7699,7 +7701,7 @@ license:CC0
 	</software>
 
 	<software name="deburas">
-		<description>Dai Kaijuu - Deburas (Jpn)</description>
+		<description>Dai Kaijuu - Deburas (Japan)</description>
 		<year>1990</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-24"/>
@@ -7723,7 +7725,7 @@ license:CC0
 	</software>
 
 	<software name="daimeiro">
-		<description>Dai Meiro - Meikyuu no Tatsujin (Jpn)</description>
+		<description>Dai Meiro - Meikyuu no Tatsujin (Japan)</description>
 		<year>1990</year>
 		<publisher>Epoch</publisher>
 		<info name="serial" value="EPO-E7"/>
@@ -7743,7 +7745,7 @@ license:CC0
 	</software>
 
 	<software name="srobot2" supported="partial">
-		<description>Dai-2-ji Super Robot Taisen (Jpn)</description>
+		<description>Dai-2-ji Super Robot Taisen (Japan)</description>
 		<year>1991</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="BAP-N9"/>
@@ -7767,7 +7769,7 @@ license:CC0
 	</software>
 
 	<software name="daikokai" cloneof="unchartd">
-		<description>Daikoukai Jidai (Jpn)</description>
+		<description>Daikoukai Jidai (Japan)</description>
 		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-QK"/>
@@ -7796,7 +7798,7 @@ license:CC0
 	</software>
 
 	<software name="daigensn" cloneof="hharry">
-		<description>Daiku no Gen-san (Jpn)</description>
+		<description>Daiku no Gen-san (Japan)</description>
 		<year>1991</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="TIX-59 (IF-24)"/>
@@ -7816,11 +7818,12 @@ license:CC0
 	</software>
 
 	<software name="daigens2">
-		<description>Daiku no Gen-San 2 - Akage no Dan no Gyakushuu (Jpn)</description>
+		<description>Daiku no Gen-san 2 - Akage no Dan no Gyakushuu (Japan)</description>
 		<year>1993</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-29"/>
 		<info name="release" value="19931022"/>
+		<info name="alt_title" value="大工の源さん2 赤毛のダンの逆襲"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="h3001" />
 			<feature name="pcb" value="IREM-H-3001" />
@@ -7834,7 +7837,7 @@ license:CC0
 	</software>
 
 	<software name="daisenr">
-		<description>Daisenryaku (Jpn)</description>
+		<description>Daisenryaku (Japan)</description>
 		<year>1988</year>
 		<publisher>Bothtec</publisher>
 		<info name="serial" value="BTC-DY"/>
@@ -7858,7 +7861,7 @@ license:CC0
 	</software>
 
 	<software name="daiva">
-		<description>Daiva Story 6: Imperial of Nirsartia (Jpn)</description>
+		<description>Daiva Story 6: Imperial of Nirsartia (Japan)</description>
 		<year>1986</year>
 		<publisher>Toemiland</publisher>
 		<info name="serial" value="TFS-DV"/>
@@ -8029,7 +8032,7 @@ license:CC0
 	</software>
 
 	<software name="dashyar" cloneof="rallybik">
-		<description>Dash Yarou (Jpn)</description>
+		<description>Dash Yarou (Japan)</description>
 		<year>1990</year>
 		<publisher>Visco</publisher>
 		<info name="serial" value="VIS-5D"/>
@@ -8049,7 +8052,7 @@ license:CC0
 	</software>
 
 	<software name="powj" cloneof="pow">
-		<description>Datsugoku (Jpn)</description>
+		<description>Datsugoku (Japan)</description>
 		<year>1989</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="KAC-P7"/>
@@ -8199,7 +8202,7 @@ license:CC0
 	</software>
 
 	<software name="deepdng3">
-		<description>Deep Dungeon III - Yuushi e no Tabi (Jpn)</description>
+		<description>Deep Dungeon III - Yuushi e no Tabi (Japan)</description>
 		<year>1988</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SQF-UT"/>
@@ -8223,7 +8226,7 @@ license:CC0
 	</software>
 
 	<software name="deepdng4">
-		<description>Deep Dungeon IV - Kuro no Youjutsushi (Jpn)</description>
+		<description>Deep Dungeon IV - Kuro no Youjutsushi (Japan)</description>
 		<year>1990</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="ASM-4D"/>
@@ -8367,7 +8370,7 @@ license:CC0
 	</software>
 
 	<software name="elrond" cloneof="wizardw">
-		<description>Densetsu no Kishi - Elrond (Jpn)</description>
+		<description>Densetsu no Kishi - Elrond (Japan)</description>
 		<year>1988</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="NMK-ER"/>
@@ -8386,7 +8389,7 @@ license:CC0
 	</software>
 
 	<software name="dstallz">
-		<description>Derby Stallion - Zenkokuban (Jpn)</description>
+		<description>Derby Stallion - Zenkokuban (Japan)</description>
 		<year>1992</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-47"/>
@@ -8564,7 +8567,7 @@ license:CC0
 
 <!-- dump confirmed by naruko -->
 	<software name="dezaemon">
-		<description>Dezaemon (Jpn)</description>
+		<description>Dezaemon (Japan)</description>
 		<year>1991</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="ATH-87"/>
@@ -8650,7 +8653,7 @@ license:CC0
 	</software>
 
 	<software name="digdug">
-		<description>Dig Dug (Jpn)</description>
+		<description>Dig Dug (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NDD-4500 (06)"/>
@@ -8671,7 +8674,7 @@ license:CC0
 	</software>
 
 	<software name="digdug2j" cloneof="digdug2">
-		<description>Dig Dug II (Jpn)</description>
+		<description>Dig Dug II (Japan)</description>
 		<year>1986</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NDDII-4500 (14)"/>
@@ -8770,7 +8773,7 @@ license:CC0
 		<publisher>Vap</publisher>
 		<info name="serial" value="VAP-VO"/>
 		<info name="release" value="19910809"/>
-		<info name="alt_title" value="ドキ!ドキ!遊園地 クレイジーランド"/>
+		<info name="alt_title" value="ドキ!ドキ!遊園地 〜クレイジーランド大作戦〜"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="txrom" />
 			<feature name="pcb" value="HVC-TLROM" />
@@ -9501,7 +9504,7 @@ license:CC0
 	</software>
 
 	<software name="doughboy">
-		<description>Dough Boy (Jpn)</description>
+		<description>Dough Boy (Japan)</description>
 		<year>1985</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-DB"/>
@@ -9521,7 +9524,7 @@ license:CC0
 	</software>
 
 	<software name="downtkos">
-		<description>Downtown Nekketsu Koushinkyoku - Soreyuke Daiundoukai (Jpn)</description>
+		<description>Downtown Nekketsu Koushinkyoku - Soreyuke Daiundoukai (Japan)</description>
 		<year>1990</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-UH"/>
@@ -9541,7 +9544,7 @@ license:CC0
 	</software>
 
 	<software name="downtown">
-		<description>Downtown - Nekketsu Monogatari (Jpn)</description>
+		<description>Downtown - Nekketsu Monogatari (Japan)</description>
 		<year>1989</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-DN"/>
@@ -10082,7 +10085,8 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="dquest2" cloneof="dwarr2">
+<!-- Game has no sound. Will this freeze up at some point like the other early Enix games? -->
+	<software name="dquest2" cloneof="dwarr2" supported="no">
 		<description>Dragon Quest II - Akuryou no Kamigami (Japan)</description>
 		<year>1987</year>
 		<publisher>Enix</publisher>
@@ -10455,7 +10459,7 @@ license:CC0
 	</software>
 
 	<software name="drgnflam">
-		<description>Advanced Dungeons &amp; Dragons - Dragons of Flame (Jpn)</description>
+		<description>Advanced Dungeons &amp; Dragons - Dragons of Flame (Japan)</description>
 		<year>1992</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-OF (R68V5941)"/>
@@ -10479,7 +10483,7 @@ license:CC0
 	</software>
 
 	<software name="dreamstr">
-		<description>Dream Master (Jpn)</description>
+		<description>Dream Master (Japan)</description>
 		<year>1992</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FPZ-5800"/>
@@ -10539,7 +10543,7 @@ license:CC0
 	</software>
 
 	<software name="ducktal2j" cloneof="ducktal2">
-		<description>Disney's DuckTales 2 (Jpn)</description>
+		<description>Disney's DuckTales 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-DW"/>
@@ -10732,7 +10736,7 @@ license:CC0
 	</software>
 
 	<software name="dungnkid">
-		<description>Dungeon Kid (Jpn)</description>
+		<description>Dungeon Kid (Japan)</description>
 		<year>1990</year>
 		<publisher>Quest</publisher>
 		<info name="serial" value="BTC-7D"/>
@@ -10780,7 +10784,7 @@ license:CC0
 	</software>
 
 	<software name="swordele" cloneof="dngmagic">
-		<description>Dungeon &amp; Magic - Swords of Element (Jpn)</description>
+		<description>Dungeon &amp; Magic - Swords of Element (Japan)</description>
 		<year>1989</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="NAT-DM"/>
@@ -11091,7 +11095,7 @@ license:CC0
 	</software>
 
 	<software name="elysion">
-		<description>Elysion (Jpn)</description>
+		<description>Elysion (Japan)</description>
 		<year>1988</year>
 		<publisher>Tokyo Shoseki</publisher>
 		<info name="serial" value="TKS-G4"/>
@@ -11111,7 +11115,7 @@ license:CC0
 	</software>
 
 	<software name="10baiyak">
-		<description>Emo Yan no 10 Bai Pro Yakyuu (Jpn)</description>
+		<description>Emo Yan no 10-bai Pro Yakyuu - Ce League-hen (Japan)</description>
 		<year>1989</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="HCT-IB/005"/>
@@ -11135,7 +11139,7 @@ license:CC0
 	</software>
 
 	<software name="erika">
-		<description>Erika to Satoru no Yume Bouken (Jpn)</description>
+		<description>Erika to Satoru no Yume Bouken (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-YB-4900"/>
@@ -11195,7 +11199,7 @@ license:CC0
 	</software>
 
 	<software name="esperbt">
-		<description>Esper Bouken Tai (Japan)</description>
+		<description>Esper Boukentai - Maou no Toride (Japan)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-15"/>
@@ -11215,7 +11219,7 @@ license:CC0
 	</software>
 
 	<software name="esperdr2">
-		<description>Esper Dream 2 - Aratanaru Tatakai (Jpn)</description>
+		<description>Esper Dream 2 - Aratanaru Tatakai (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC861"/>
@@ -11329,7 +11333,7 @@ license:CC0
 	</software>
 
 	<software name="exedexes">
-		<description>Exed Exes (Jpn)</description>
+		<description>Exed Exes (Japan)</description>
 		<year>1985</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="GTS-EE"/>
@@ -11349,7 +11353,7 @@ license:CC0
 	</software>
 
 	<software name="exerion">
-		<description>Exerion (Jpn)</description>
+		<description>Exerion (Japan)</description>
 		<year>1985</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-01"/>
@@ -11623,7 +11627,7 @@ license:CC0
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-7F (11)"/>
 		<info name="release" value="19920207"/>
-		<info name="alt_title" value="F-1サーカス"/>
+		<info name="alt_title" value="F1サーカス"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="txrom" />
 			<feature name="pcb" value="HVC-TKROM" />
@@ -11680,7 +11684,7 @@ license:CC0
 	</software>
 
 	<software name="famijmp2">
-		<description>Famicom Jump II - Saikyou no 7 Nin (Japan)</description>
+		<description>Famicom Jump II - Saikyou no 7-nin (Japan)</description>
 		<year>1991</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-FJ2"/>
@@ -11938,7 +11942,7 @@ license:CC0
 	</software>
 
 	<software name="famiblck" cloneof="thndlght">
-		<description>Family Block (Jpn)</description>
+		<description>Family Block (Japan)</description>
 		<year>1991</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="ATH-4T"/>
@@ -11958,7 +11962,7 @@ license:CC0
 	</software>
 
 	<software name="famboxin" cloneof="ringking">
-		<description>Family Boxing (Jpn)</description>
+		<description>Family Boxing (Japan)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FB-4900"/>
@@ -11978,7 +11982,7 @@ license:CC0
 	</software>
 
 	<software name="famcirc">
-		<description>Family Circuit (Jpn)</description>
+		<description>Family Circuit (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FC-3900"/>
@@ -11998,7 +12002,7 @@ license:CC0
 	</software>
 
 	<software name="famcir91">
-		<description>Family Circuit '91 (Jpn)</description>
+		<description>Family Circuit '91 (Japan)</description>
 		<year>1991</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FC91-7800"/>
@@ -12121,7 +12125,7 @@ license:CC0
 	</software>
 
 	<software name="famipinb" cloneof="rocknbal">
-		<description>Family Pinball (Jpn)</description>
+		<description>Family Pinball (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FP-4900"/>
@@ -12141,7 +12145,7 @@ license:CC0
 	</software>
 
 	<software name="famiquiz">
-		<description>Family Quiz - 4-nin wa Rival (Jpn)</description>
+		<description>Family Quiz - 4-nin wa Rival (Japan)</description>
 		<year>1988</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="ATH-FQ"/>
@@ -12161,7 +12165,7 @@ license:CC0
 	</software>
 
 	<software name="famitenn">
-		<description>Family Tennis (Jpn)</description>
+		<description>Family Tennis (Japan)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FT-3900"/>
@@ -12374,7 +12378,7 @@ license:CC0
 	</software>
 
 	<software name="famist89">
-		<description>Famista '89 - Kaimaku Ban!! (Jpn)</description>
+		<description>Famista '89 - Kaimaku Ban!! (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FS89-4900"/>
@@ -12394,7 +12398,7 @@ license:CC0
 	</software>
 
 	<software name="famist90">
-		<description>Famista '90 (Jpn)</description>
+		<description>Famista '90 (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-F90-5800"/>
@@ -12418,7 +12422,7 @@ license:CC0
 	</software>
 
 	<software name="famist91">
-		<description>Famista '91 (Jpn)</description>
+		<description>Famista '91 (Japan)</description>
 		<year>1990</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-F91-4900"/>
@@ -12438,7 +12442,7 @@ license:CC0
 	</software>
 
 	<software name="famist92">
-		<description>Famista '92 (Jpn)</description>
+		<description>Famista '92 (Japan)</description>
 		<year>1991</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-F92-5000"/>
@@ -12458,7 +12462,7 @@ license:CC0
 	</software>
 
 	<software name="famist93">
-		<description>Famista '93 (Jpn)</description>
+		<description>Famista '93 (Japan)</description>
 		<year>1992</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-F93-4900"/>
@@ -12478,7 +12482,7 @@ license:CC0
 	</software>
 
 	<software name="famist94">
-		<description>Famista '94 (Jpn)</description>
+		<description>Famista '94 (Japan)</description>
 		<year>1993</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-F94-3900"/>
@@ -12554,7 +12558,7 @@ license:CC0
 	</software>
 
 	<software name="opaopa">
-		<description>Fantasy Zone II - Opa-Opa no Namida (Jpn)</description>
+		<description>Fantasy Zone II - Opa-Opa no Namida (Japan)</description>
 		<year>1988</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-FZII-5500 (SS12)"/>
@@ -12573,7 +12577,7 @@ license:CC0
 	</software>
 
 	<software name="fariaj" cloneof="faria">
-		<description>Faria - Fuuin no Tsurugi (Jpn)</description>
+		<description>Faria - Fuuin no Tsurugi (Japan)</description>
 		<year>1989</year>
 		<publisher>High Score Media Work</publisher>
 		<info name="serial" value="HSS-FA"/>
@@ -12620,7 +12624,7 @@ license:CC0
 	</software>
 
 	<software name="faxanaduj" cloneof="faxanadu">
-		<description>Faxanadu (Jpn)</description>
+		<description>Faxanadu (Japan)</description>
 		<year>1987</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-FX"/>
@@ -12697,7 +12701,7 @@ license:CC0
 	</software>
 
 	<software name="fcgenjin" cloneof="bonk">
-		<description>FC Genjin - Freakthoropus Computerus (Jpn)</description>
+		<description>FC Genjin - Friendthropus Computerurus (Japan)</description>
 		<year>1993</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-F3"/>
@@ -12797,7 +12801,7 @@ license:CC0
 	</software>
 
 	<software name="ferrarij" cloneof="ferrari">
-		<description>Ferrari Grand Prix Challenge (Jpn)</description>
+		<description>Ferrari Grand Prix Challenge (Japan)</description>
 		<year>1992</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-FS"/>
@@ -12855,7 +12859,7 @@ license:CC0
 	</software>
 
 	<software name="fieldcom">
-		<description>Field Combat (Jpn)</description>
+		<description>Field Combat (Japan)</description>
 		<year>1985</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-04"/>
@@ -12876,7 +12880,7 @@ license:CC0
 	</software>
 
 	<software name="fightglf" cloneof="leetrevn">
-		<description>Fighting Golf (Jpn)</description>
+		<description>Fighting Golf (Japan)</description>
 		<year>1988</year>
 		<publisher>SNK</publisher>
 		<info name="serial" value="SFX-FI"/>
@@ -13053,7 +13057,7 @@ license:CC0
 	</software>
 
 	<software name="ffant3">
-		<description>Final Fantasy III (Jpn)</description>
+		<description>Final Fantasy III (Japan)</description>
 		<year>1990</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SQF-FC"/>
@@ -13077,7 +13081,7 @@ license:CC0
 	</software>
 
 	<software name="finallap">
-		<description>Final Lap (Jpn)</description>
+		<description>Final Lap (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FL-5200"/>
@@ -13100,7 +13104,7 @@ license:CC0
 	</software>
 
 	<software name="finalmis" cloneof="actionny">
-		<description>Final Mission (Jpn)</description>
+		<description>Final Mission (Japan)</description>
 		<year>1990</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="NAT-FV"/>
@@ -13120,7 +13124,7 @@ license:CC0
 	</software>
 
 	<software name="firembg">
-		<description>Fire Emblem Gaiden (Jpn)</description>
+		<description>Fire Emblem Gaiden (Japan)</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-2I"/>
@@ -13143,7 +13147,7 @@ license:CC0
 	</software>
 
 	<software name="firemb">
-		<description>Fire Emblem - Ankokuryuu to Hikari no Ken (Jpn)</description>
+		<description>Fire Emblem - Ankokuryuu to Hikari no Ken (Japan)</description>
 		<year>1990</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-VX"/>
@@ -13279,7 +13283,7 @@ license:CC0
 	</software>
 
 	<software name="flappy">
-		<description>Flappy (Jpn)</description>
+		<description>Flappy (Japan)</description>
 		<year>1985</year>
 		<publisher>dB-SOFT</publisher>
 		<info name="serial" value="DBF-FL"/>
@@ -13299,7 +13303,7 @@ license:CC0
 	</software>
 
 	<software name="fleetcom">
-		<description>Fleet Commander (Jpn)</description>
+		<description>Fleet Commander (Japan)</description>
 		<year>1988</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-10"/>
@@ -13415,7 +13419,7 @@ license:CC0
 	</software>
 
 	<software name="flipull">
-		<description>Flipull - An Exciting Cube Game (Jpn, v1.1)</description>
+		<description>Flipull - An Exciting Cube Game (Japan, v1.1)</description>
 		<year>1989</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-FP-3900 (29)"/>
@@ -13435,7 +13439,7 @@ license:CC0
 	</software>
 
 	<software name="flipull1" cloneof="flipull">
-		<description>Flipull - An Exciting Cube Game (Jpn)</description>
+		<description>Flipull - An Exciting Cube Game (Japan)</description>
 		<year>1989</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-FP-3900 (29)"/>
@@ -13531,7 +13535,7 @@ license:CC0
 	</software>
 
 	<software name="formatz">
-		<description>Formation Z (Jpn, v1.1)</description>
+		<description>Formation Z (Japan, v1.1)</description>
 		<year>1985</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-02"/>
@@ -13694,7 +13698,7 @@ license:CC0
 	</software>
 
 	<software name="frontlin">
-		<description>Front Line (Jpn)</description>
+		<description>Front Line (Japan)</description>
 		<year>1985</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-FL-4500 (03)"/>
@@ -13715,7 +13719,7 @@ license:CC0
 	</software>
 
 	<software name="fudomyod" cloneof="demnswrd">
-		<description>Fudou Myouou Den (Jpn)</description>
+		<description>Fudou Myouou Den (Japan)</description>
 		<year>1988</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-FM-5900 (17)"/>
@@ -13758,7 +13762,7 @@ license:CC0
 	</software>
 
 	<software name="fuzzical">
-		<description>Fuzzical Fighter (Jpn)</description>
+		<description>Fuzzical Fighter (Japan)</description>
 		<year>1991</year>
 		<publisher>Sigma Shougi</publisher>
 		<info name="serial" value="SEI-1E"/>
@@ -13816,7 +13820,7 @@ license:CC0
 	</software>
 
 	<software name="galagaj" cloneof="galaga">
-		<description>Galaga (Jpn)</description>
+		<description>Galaga (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NGG-4500 (05)"/>
@@ -13875,7 +13879,7 @@ license:CC0
 	</software>
 
 	<software name="galaxiana" cloneof="galaxian">
-		<description>Galaxian (Jpn)</description>
+		<description>Galaxian (Japan)</description>
 		<year>1984</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NGX-4500 (01)"/>
@@ -13953,7 +13957,7 @@ license:CC0
 	</software>
 
 	<software name="gambler">
-		<description>Gambler Jikochuushinha (Jpn)</description>
+		<description>Gambler Jikochuushinha (Japan)</description>
 		<year>1988</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="ASM-GJ"/>
@@ -13976,7 +13980,7 @@ license:CC0
 	</software>
 
 	<software name="gambler2">
-		<description>Gambler Jikochuushinha 2 (Jpn)</description>
+		<description>Gambler Jikochuushinha 2 (Japan)</description>
 		<year>1990</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="ASM-2J"/>
@@ -14000,7 +14004,7 @@ license:CC0
 	</software>
 
 	<software name="ggoemon2">
-		<description>Ganbare Goemon 2 (Jpn)</description>
+		<description>Ganbare Goemon 2 (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC833"/>
@@ -14029,7 +14033,7 @@ license:CC0
 	</software>
 
 	<software name="ggoemg2">
-		<description>Ganbare Goemon Gaiden 2 - Tenka no Zaihou (Jpn)</description>
+		<description>Ganbare Goemon Gaiden 2 - Tenka no Zaihou (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC857"/>
@@ -14054,7 +14058,7 @@ license:CC0
 	</software>
 
 	<software name="ggoemg">
-		<description>Ganbare Goemon Gaiden - Keita Ougon Kiseru (Jpn)</description>
+		<description>Ganbare Goemon Gaiden - Kieta Ougon Kiseru (Japan)</description>
 		<year>1990</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC840"/>
@@ -14087,7 +14091,7 @@ license:CC0
 	</software>
 
 	<software name="ggoemon">
-		<description>Ganbare Goemon! Karakuri Douchuu (Jpn)</description>
+		<description>Ganbare Goemon! Karakuri Douchuu (Japan)</description>
 		<year>1986</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC815"/>
@@ -14106,7 +14110,7 @@ license:CC0
 	</software>
 
 	<software name="pennant">
-		<description>Ganbare Pennant Race! (Jpn)</description>
+		<description>Ganbare Pennant Race! (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC834"/>
@@ -14135,7 +14139,7 @@ license:CC0
 	</software>
 
 	<software name="gsayuki">
-		<description>Ganso Saiyuuki Super Monkey Daibouken (Jpn)</description>
+		<description>Ganso Saiyuuki Super Monkey Daibouken (Japan)</description>
 		<year>1986</year>
 		<publisher>Vap</publisher>
 		<info name="serial" value="VAP-GS"/>
@@ -14301,7 +14305,7 @@ license:CC0
 	</software>
 
 	<software name="gegege2">
-		<description>GeGeGe no Kitarou 2 - Youkai Gundan no Chousen (Jpn)</description>
+		<description>GeGeGe no Kitarou 2 - Youkai Gundan no Chousen (Japan)</description>
 		<year>1987</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-ONI2"/>
@@ -14321,7 +14325,7 @@ license:CC0
 	</software>
 
 	<software name="gegege" cloneof="ninjakid" supported="no">
-		<description>GeGeGe no Kitarou - Youkai Daimakyou (Jpn)</description>
+		<description>GeGeGe no Kitarou - Youkai Daimakyou (Japan)</description>
 		<year>1986</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-GE"/>
@@ -14341,7 +14345,7 @@ license:CC0
 	</software>
 
 	<software name="geimos">
-		<description>Geimos (Jpn)</description>
+		<description>Geimos (Japan)</description>
 		<year>1985</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-02"/>
@@ -14361,7 +14365,7 @@ license:CC0
 	</software>
 
 	<software name="gekikame" cloneof="tmnt">
-		<description>Gekikame Ninja Den (Jpn)</description>
+		<description>Gekikame Ninja Den (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-GN"/>
@@ -14381,7 +14385,7 @@ license:CC0
 	</software>
 
 	<software name="yonkubat">
-		<description>Gekitotsu Yonku Battle (Jpn)</description>
+		<description>Gekitotsu Yonku Battle (Japan)</description>
 		<year>1989</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-15"/>
@@ -14401,7 +14405,7 @@ license:CC0
 	</software>
 
 	<software name="gekprow" cloneof="tecmowrs">
-		<description>Gekitou Pro Wres!! Toukon Densetsu (Jpn)</description>
+		<description>Gekitou Pro Wres!! Toukon Densetsu (Japan)</description>
 		<year>1989</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-PZ"/>
@@ -14421,7 +14425,7 @@ license:CC0
 	</software>
 
 	<software name="gekstad" cloneof="badnewsb">
-		<description>Gekitou Stadium!! (Jpn)</description>
+		<description>Gekitou Stadium!! (Japan)</description>
 		<year>1989</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-EF"/>
@@ -14492,7 +14496,7 @@ license:CC0
 	</software>
 
 	<software name="genpei">
-		<description>Genpei Touma Den - Computer Boardgame (Jpn)</description>
+		<description>Genpei Touma Den - Computer Boardgame (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-GT-4900"/>
@@ -14577,7 +14581,7 @@ license:CC0
 	</software>
 
 	<software name="ghostbstj" cloneof="ghostbst">
-		<description>Ghostbusters (Jpn)</description>
+		<description>Ghostbusters (Japan)</description>
 		<year>1986</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="GTS-GB"/>
@@ -14720,7 +14724,7 @@ license:CC0
 	</software>
 
 	<software name="gimquiz">
-		<description>Gimmi a Break - Shijou Saikyou no Quiz Ou Ketteisen (Jpn)</description>
+		<description>Gimmi a Break - Shijou Saikyou no Quiz Ou Ketteisen (Japan)</description>
 		<year>1991</year>
 		<publisher>Party Room 21</publisher>
 		<info name="serial" value="YZW-QY"/>
@@ -14741,7 +14745,7 @@ license:CC0
 	</software>
 
 	<software name="gimquiz2">
-		<description>Gimmi a Break - Shijou Saikyou no Quiz Ou Ketteisen 2 (Jpn)</description>
+		<description>Gimmi a Break - Shijou Saikyou no Quiz Ou Ketteisen 2 (Japan)</description>
 		<year>1992</year>
 		<publisher>Party Room 21</publisher>
 		<info name="serial" value="YZW-QP"/>
@@ -14762,7 +14766,7 @@ license:CC0
 	</software>
 
 	<software name="gimmickj" cloneof="gimmick">
-		<description>Gimmick! (Jpn)</description>
+		<description>Gimmick! (Japan)</description>
 		<year>1992</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-GMK-6200"/>
@@ -14781,7 +14785,7 @@ license:CC0
 	</software>
 
 	<software name="gingaed">
-		<description>Ginga Eiyuu Densetsu (Jpn)</description>
+		<description>Ginga Eiyuu Densetsu - Waga Yuku wa Hoshi no Taikai (Japan)</description>
 		<year>1988</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-GE"/>
@@ -14804,7 +14808,7 @@ license:CC0
 	</software>
 
 	<software name="gingasan">
-		<description>Ginga no Sannin (Jpn)</description>
+		<description>Ginga no Sannin (Japan)</description>
 		<year>1987</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-GT"/>
@@ -14901,7 +14905,7 @@ license:CC0
 	</software>
 
 	<software name="godzillaj" cloneof="godzilla">
-		<description>Godzilla (Jpn)</description>
+		<description>Godzilla (Japan)</description>
 		<year>1988</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="THF-GZ"/>
@@ -14977,7 +14981,7 @@ license:CC0
 	</software>
 
 	<software name="golfj" cloneof="golf">
-		<description>Golf (Jpn)</description>
+		<description>Golf (Japan)</description>
 		<year>1984</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-GF"/>
@@ -15674,7 +15678,7 @@ license:CC0
 	</software>
 
 	<software name="guardic" cloneof="guardlgn" supported="no">
-		<description>Guardic Gaiden (Jpn)</description>
+		<description>Guardic Gaiden (Japan)</description>
 		<year>1987</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-08"/>
@@ -15731,7 +15735,7 @@ license:CC0
 	</software>
 
 	<software name="guevara" cloneof="gwar">
-		<description>Guevara (Jpn)</description>
+		<description>Guevara (Japan)</description>
 		<year>1988</year>
 		<publisher>SNK</publisher>
 		<info name="serial" value="SFX-GQ"/>
@@ -15771,7 +15775,7 @@ license:CC0
 	</software>
 
 	<software name="gunhed">
-		<description>GunHed - Arutanaru Tatakai (Jpn)</description>
+		<description>GunHed - Arutanaru Tatakai (Japan)</description>
 		<year>1990</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="VRE-R3"/>
@@ -15795,7 +15799,7 @@ license:CC0
 	</software>
 
 	<software name="gunnacj" cloneof="gunnac">
-		<description>Gun Nac (Jpn)</description>
+		<description>Gun Nac (Japan)</description>
 		<year>1990</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="TKS-XG"/>
@@ -15834,7 +15838,7 @@ license:CC0
 	</software>
 
 	<software name="gunsight" cloneof="laserinv" supported="partial">
-		<description>Gun Sight (Jpn)</description>
+		<description>Gun Sight (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-8G"/>
@@ -15894,7 +15898,7 @@ license:CC0
 	</software>
 
 	<software name="gyrodine">
-		<description>Gyrodine (Jpn)</description>
+		<description>Gyrodine (Japan)</description>
 		<year>1986</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-GD-4900 (06)"/>
@@ -15914,7 +15918,7 @@ license:CC0
 	</software>
 
 	<software name="gyromite" supported="partial">
-		<description>Gyromite (Euro, USA) ~ Gyro (Jpn)</description>
+		<description>Gyromite (Euro, USA) ~ Gyro (Japan)</description>
 		<year>1985</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-GY, NES-GY-USA, NES-GY-(FRA/GBR)"/>
@@ -15954,7 +15958,7 @@ license:CC0
 	</software>
 
 	<software name="hajafuin">
-		<description>Haja no Fuuin (Jpn)</description>
+		<description>Haja no Fuuin (Japan)</description>
 		<year>1987</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-08"/>
@@ -15993,7 +15997,7 @@ license:CC0
 	</software>
 
 	<software name="hanastar">
-		<description>Hana no Star Kaidou (Jpn)</description>
+		<description>Hana no Star Kaidou (Japan)</description>
 		<year>1987</year>
 		<publisher>Victor Ongaku Sangyou</publisher>
 		<info name="serial" value="VFR-H1 (02)"/>
@@ -16013,7 +16017,7 @@ license:CC0
 	</software>
 
 	<software name="hanjuher">
-		<description>Hanjuku Hero (Jpn)</description>
+		<description>Hanjuku Hero (Japan)</description>
 		<year>1988</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SQF-HJ"/>
@@ -16107,7 +16111,7 @@ license:CC0
 	</software>
 
 	<software name="hatrisj" cloneof="hatris">
-		<description>Hatris (Jpn)</description>
+		<description>Hatris (Japan)</description>
 		<year>1990</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="BPS-JZ"/>
@@ -16152,7 +16156,7 @@ license:CC0
 	</software>
 
 	<software name="superigo">
-		<description>Hayauchi Super Igo (Jpn)</description>
+		<description>Hayauchi Super Igo (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-X79-5900"/>
@@ -16175,7 +16179,7 @@ license:CC0
 	</software>
 
 	<software name="hbarrelj" cloneof="hbarrel" supported="no">
-		<description>Heavy Barrel (Jpn)</description>
+		<description>Heavy Barrel (Japan)</description>
 		<year>1990</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-XH"/>
@@ -16250,7 +16254,7 @@ license:CC0
 	</software>
 
 	<software name="hebereke" cloneof="ufouria">
-		<description>Hebereke (Jpn)</description>
+		<description>Hebereke (Japan)</description>
 		<year>1991</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-HEB-6200"/>
@@ -16269,7 +16273,7 @@ license:CC0
 	</software>
 
 	<software name="hector87" cloneof="starship">
-		<description>Hector '87 (Jpn)</description>
+		<description>Hector '87 (Japan)</description>
 		<year>1987</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-HH"/>
@@ -16289,7 +16293,7 @@ license:CC0
 	</software>
 
 	<software name="bakabon">
-		<description>Heisei Tensai Bakabon (Jpn)</description>
+		<description>Heisei Tensai Bakabon (Japan)</description>
 		<year>1991</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FTB-5800"/>
@@ -16309,7 +16313,7 @@ license:CC0
 	</software>
 
 	<software name="helloko">
-		<description>Hello Kitty no Ohanabatake (Jpn)</description>
+		<description>Hello Kitty no Ohanabatake (Japan)</description>
 		<year>1992</year>
 		<publisher>Character Soft</publisher>
 		<info name="serial" value="CTS-HL"/>
@@ -16329,7 +16333,7 @@ license:CC0
 	</software>
 
 	<software name="hellokw">
-		<description>Hello Kitty World (Jpn)</description>
+		<description>Hello Kitty World (Japan)</description>
 		<year>1992</year>
 		<publisher>Character Soft</publisher>
 		<info name="serial" value="CTS-HW"/>
@@ -16349,7 +16353,7 @@ license:CC0
 	</software>
 
 	<software name="herakl2">
-		<description>Herakles no Eikou II - Titan no Metsubou (Jpn)</description>
+		<description>Herakles no Eikou II - Titan no Metsubou (Japan)</description>
 		<year>1989</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-2H"/>
@@ -16373,7 +16377,7 @@ license:CC0
 	</software>
 
 	<software name="herakles">
-		<description>Herakles no Eikou - Toujin Makyouden (Jpn)</description>
+		<description>Herakles no Eikou - Toujin Makyouden (Japan)</description>
 		<year>1987</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-HE"/>
@@ -16477,7 +16481,7 @@ license:CC0
 	</software>
 
 	<software name="hinotori">
-		<description>Hi no Tori - Houou-hen - Gaou no Bouken (Jpn)</description>
+		<description>Hi no Tori - Houou-hen - Gaou no Bouken (Japan)</description>
 		<year>1987</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC817"/>
@@ -16497,7 +16501,7 @@ license:CC0
 	</software>
 
 	<software name="higemaru" cloneof="makaisln">
-		<description>Higemaru Makaijima - Nanatsu no Shima Daibouken (Jpn)</description>
+		<description>Higemaru Makaijima - Nanatsu no Shima Daibouken (Japan)</description>
 		<year>1987</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-MZ"/>
@@ -16561,7 +16565,7 @@ license:CC0
 	</software>
 
 	<software name="highway" cloneof="radracer" supported="partial">
-		<description>Highway Star (Jpn)</description>
+		<description>Highway Star (Japan)</description>
 		<year>1987</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SQF-HI"/>
@@ -16582,7 +16586,7 @@ license:CC0
 	</software>
 
 	<software name="photon">
-		<description>Hikari no Senshi Photon - The Ultimate Game on Planet Earth (Jpn)</description>
+		<description>Hikari no Senshi Photon - The Ultimate Game on Planet Earth (Japan)</description>
 		<year>1987</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="TFC-PH"/>
@@ -16602,7 +16606,7 @@ license:CC0
 	</software>
 
 	<software name="hillsfarj" cloneof="hillsfar">
-		<description>Advanced Dungeons &amp; Dragons - Hillsfar (Jpn)</description>
+		<description>Advanced Dungeons &amp; Dragons - Hillsfar (Japan)</description>
 		<year>1991</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-QQ (R78V5936)"/>
@@ -16649,7 +16653,7 @@ license:CC0
 	</software>
 
 	<software name="ponkikki">
-		<description>Hirake! Ponkikki (Jpn)</description>
+		<description>Hirake! Ponkikki (Japan)</description>
 		<year>1992</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="TFC-PK"/>
@@ -16669,7 +16673,7 @@ license:CC0
 	</software>
 
 	<software name="hiryukn2">
-		<description>Hiryuu no Ken II - Dragon no Tsubasa (Jpn)</description>
+		<description>Hiryuu no Ken II - Dragon no Tsubasa (Japan)</description>
 		<year>1988</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="CBF-H2"/>
@@ -16748,7 +16752,7 @@ license:CC0
 	</software>
 
 	<software name="hiryuken" cloneof="flyindrg">
-		<description>Hiryuu no Ken - Ougi no Sho (Jpn)</description>
+		<description>Hiryuu no Ken - Ougi no Sho (Japan)</description>
 		<year>1987</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="NFC-HR"/>
@@ -16768,7 +16772,7 @@ license:CC0
 	</software>
 
 	<software name="hdyaburi">
-		<description>Hissatsu Doujou Yaburi (Jpn)</description>
+		<description>Hissatsu Doujou Yaburi (Japan)</description>
 		<year>1989</year>
 		<publisher>Sigma Enterprises</publisher>
 		<info name="serial" value="SEI-1A"/>
@@ -16878,7 +16882,7 @@ license:CC0
 	</software>
 
 	<software name="okhotsk">
-		<description>Hokkaidou Rensa Satsujin - Okhotsk ni Shoyu (Jpn)</description>
+		<description>Hokkaidou Rensa Satsujin - Okhotsk ni Shoyu (Japan)</description>
 		<year>1987</year>
 		<publisher>Login Soft</publisher>
 		<info name="serial" value="HSP-07"/>
@@ -16899,7 +16903,7 @@ license:CC0
 	</software>
 
 	<software name="hokuto">
-		<description>Hokuto no Ken (Jpn)</description>
+		<description>Hokuto no Ken (Japan)</description>
 		<year>1986</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-HK"/>
@@ -16919,7 +16923,7 @@ license:CC0
 	</software>
 
 	<software name="hokuto2" cloneof="fotns">
-		<description>Hokuto no Ken 2 - Seikimatsu Kyuuseishu Densetsu (Jpn)</description>
+		<description>Hokuto no Ken 2 - Seikimatsu Kyuuseishu Densetsu (Japan)</description>
 		<year>1987</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-HO"/>
@@ -16939,7 +16943,7 @@ license:CC0
 	</software>
 
 	<software name="hokuto3">
-		<description>Hokuto no Ken 3 - Shinseiki Souzou - Seiken Retsuden (Jpn)</description>
+		<description>Hokuto no Ken 3 - Shinseiki Souzou - Seiken Retsuden (Japan)</description>
 		<year>1989</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-K3"/>
@@ -16963,7 +16967,7 @@ license:CC0
 	</software>
 
 	<software name="hokuto4">
-		<description>Hokuto no Ken 4 - Shichisei Haken Den - Hokuto Shinken no Kanata e (Jpn)</description>
+		<description>Hokuto no Ken 4 - Shichisei Haken Den - Hokuto Shinken no Kanata e (Japan)</description>
 		<year>1991</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-97"/>
@@ -17006,7 +17010,7 @@ license:CC0
 	</software>
 
 	<software name="holydivr">
-		<description>Holy Diver (Jpn)</description>
+		<description>Holy Diver (Japan)</description>
 		<year>1989</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-12"/>
@@ -17560,7 +17564,7 @@ license:CC0
 	</software>
 
 	<software name="hydlidej" cloneof="hydlide">
-		<description>Hydlide Special (Jpn)</description>
+		<description>Hydlide Special (Japan)</description>
 		<year>1986</year>
 		<publisher>Toemiland</publisher>
 		<info name="serial" value="TFS-HS"/>
@@ -17580,7 +17584,7 @@ license:CC0
 	</software>
 
 	<software name="hyokkohj">
-		<description>Hyokkori Hyoutanjima - Nazo no Kaizokusen (Jpn)</description>
+		<description>Hyokkori Hyoutanjima - Nazo no Kaizokusen (Japan)</description>
 		<year>1992</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHI-HV"/>
@@ -17600,7 +17604,7 @@ license:CC0
 	</software>
 
 	<software name="hyperol">
-		<description>Hyper Olympic (Jpn)</description>
+		<description>Hyper Olympic (Japan)</description>
 		<year>1985</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC800"/>
@@ -17642,7 +17646,7 @@ license:CC0
 	</software>
 
 	<software name="hyperspt1" cloneof="hyperspt">
-		<description>Hyper Sports (Jpn)</description>
+		<description>Hyper Sports (Japan)</description>
 		<year>1985</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC806"/>
@@ -17664,7 +17668,7 @@ license:CC0
 	</software>
 
 	<software name="hyperspt">
-		<description>Hyper Sports (Jpn, v1.1)</description>
+		<description>Hyper Sports (Japan, v1.1)</description>
 		<year>1985</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC806"/>
@@ -17686,7 +17690,7 @@ license:CC0
 	</software>
 
 	<software name="iceclimbj" cloneof="iceclimb">
-		<description>Ice Climber (Jpn)</description>
+		<description>Ice Climber (Japan)</description>
 		<year>1985</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-IC"/>
@@ -18023,7 +18027,7 @@ license:CC0
 	</software>
 
 	<software name="ikeike">
-		<description>Ike Ike! Nekketsu Hockey Bu - Subette Koronde Dai Rantou (Jpn)</description>
+		<description>Ike Ike! Nekketsu Hockey Bu - Subette Koronde Dai Rantou (Japan)</description>
 		<year>1992</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-I3"/>
@@ -18043,7 +18047,7 @@ license:CC0
 	</software>
 
 	<software name="ikinarim">
-		<description>Ikinari Musician (Jpn)</description>
+		<description>Ikinari Musician (Japan)</description>
 		<year>1987</year>
 		<publisher>Tokyo Shoseki</publisher>
 		<info name="serial" value="TKS-G1"/>
@@ -18063,7 +18067,7 @@ license:CC0
 	</software>
 
 	<software name="ikki">
-		<description>Ikki (Jpn)</description>
+		<description>Ikki (Japan)</description>
 		<year>1985</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-RIK-4900 (SS3)"/>
@@ -18084,7 +18088,7 @@ license:CC0
 	</software>
 
 	<software name="imagefgtj" cloneof="imagefgt">
-		<description>Image Fight (Jpn)</description>
+		<description>Image Fight (Japan)</description>
 		<year>1990</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-14"/>
@@ -18514,7 +18518,7 @@ license:CC0
 	</software>
 
 	<software name="keibahg">
-		<description>Isaki Shuugorou no Keiba Hisshou Gaku (Jpn)</description>
+		<description>Isaki Shuugorou no Keiba Hisshou Gaku (Japan)</description>
 		<year>1990</year>
 		<publisher>Imagineering</publisher>
 		<info name="serial" value="IMA-EK"/>
@@ -18538,7 +18542,7 @@ license:CC0
 	</software>
 
 	<software name="ishinara">
-		<description>Ishin no Arashi (Jpn)</description>
+		<description>Ishin no Arashi (Japan)</description>
 		<year>1990</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-XK"/>
@@ -18610,7 +18614,7 @@ license:CC0
 	</software>
 
 	<software name="itadaki">
-		<description>Itadaki Street - Watashi no Mise ni Yottette (Jpn)</description>
+		<description>Itadaki Street - Watashi no Mise ni Yottette (Japan)</description>
 		<year>1991</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-35"/>
@@ -18635,7 +18639,7 @@ license:CC0
 	</software>
 
 	<software name="jjtobi2">
-		<description>JJ Tobidase Daisakusen Part 2 (Jpn)</description>
+		<description>JJ Tobidase Daisakusen Part 2 (Japan)</description>
 		<year>1987</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SQF-JJ"/>
@@ -18656,7 +18660,7 @@ license:CC0
 	</software>
 
 	<software name="jlwingol">
-		<description>J.League Winning Goal (Jpn)</description>
+		<description>J.League Winning Goal (Japan)</description>
 		<year>1994</year>
 		<publisher>Electronic Arts Victor</publisher>
 		<info name="serial" value="HVC-W3"/>
@@ -18737,7 +18741,7 @@ license:CC0
 	</software>
 
 	<software name="jchanj" cloneof="jchan">
-		<description>Jackie Chan (Jpn)</description>
+		<description>Jackie Chan (Japan)</description>
 		<year>1991</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-V5"/>
@@ -18795,7 +18799,7 @@ license:CC0
 	</software>
 
 	<software name="jajageki">
-		<description>Jajamaru Gekimaden - Maboroshi no Kinmajou (Jpn)</description>
+		<description>Jajamaru Gekimaden - Maboroshi no Kinmajou (Japan)</description>
 		<year>1990</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-27"/>
@@ -18818,7 +18822,7 @@ license:CC0
 	</software>
 
 	<software name="jajaninp" cloneof="taroqst">
-		<description>Jajamaru Ninpouchou (Jpn)</description>
+		<description>Jajamaru Ninpouchou (Japan)</description>
 		<year>1989</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-22"/>
@@ -18837,7 +18841,7 @@ license:CC0
 	</software>
 
 	<software name="jajamaru">
-		<description>Jajamaru no Daibouken (Jpn)</description>
+		<description>Jajamaru no Daibouken (Japan)</description>
 		<year>1986</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-09"/>
@@ -18894,7 +18898,7 @@ license:CC0
 	</software>
 
 	<software name="jarinko">
-		<description>Jarinko Chie - Bakudan Musume no Shiawase Sagashi (Jpn)</description>
+		<description>Jarinko Chie - Bakudan Musume no Shiawase Sagashi (Japan)</description>
 		<year>1988</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC828"/>
@@ -18942,12 +18946,12 @@ license:CC0
 	</software>
 
 	<software name="drjekyllj" cloneof="drjekyll">
-		<description>Jekyll Hakase no Houma ga Toki (Jpn)</description>
+		<description>Jekyll Hakase no Houma ga Toki (Japan)</description>
 		<year>1988</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="THF-TK"/>
 		<info name="release" value="19880408"/>
-		<info name="alt_title" value="ジキール博士の彷魔が刻"/>
+		<info name="alt_title" value="ジーキル博士の彷魔が刻"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="uxrom" />
 			<feature name="pcb" value="HVC-UNROM" />
@@ -19038,7 +19042,7 @@ license:CC0
 	</software>
 
 	<software name="jesus" supported="no">
-		<description>Jesus - Kyoufu no Bio Monster (Jpn)</description>
+		<description>Jesus - Kyoufu no Bio Monster (Japan)</description>
 		<year>1989</year>
 		<publisher>King Records</publisher>
 		<info name="serial" value="KIN-GP"/>
@@ -19096,7 +19100,7 @@ license:CC0
 	</software>
 
 	<software name="jigokugm" cloneof="kabuki">
-		<description>Jigoku Gokuraku Maru (Jpn)</description>
+		<description>Jigoku Gokuraku Maru (Japan)</description>
 		<year>1990</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="PAC-9Z"/>
@@ -19116,7 +19120,7 @@ license:CC0
 	</software>
 
 	<software name="debias">
-		<description>Jikuu Yuuden - Debias (Jpn)</description>
+		<description>Jikuu Yuuden - Debias (Japan)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-DE-4900"/>
@@ -19230,7 +19234,7 @@ license:CC0
 	</software>
 
 	<software name="jongbou">
-		<description>Jongbou (Jpn)</description>
+		<description>Jongbou (Japan)</description>
 		<year>1987</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="KAC-JB"/>
@@ -19345,7 +19349,7 @@ license:CC0
 	</software>
 
 	<software name="joymech">
-		<description>Joy Mech Fight (Jpn)</description>
+		<description>Joy Mech Fight (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-JM"/>
@@ -19369,7 +19373,7 @@ license:CC0
 	</software>
 
 	<software name="juju" cloneof="toki">
-		<description>JuJu Densetsu (Jpn)</description>
+		<description>JuJu Densetsu (Japan)</description>
 		<year>1991</year>
 		<publisher>Taito / Disco</publisher>
 		<info name="serial" value="DTF-5J (38)"/>
@@ -19389,12 +19393,12 @@ license:CC0
 	</software>
 
 	<software name="holein1">
-		<description>Jumbo Ozaki no Hole in One Professional (Jpn)</description>
+		<description>Jumbo Ozaki no Hole in One Professional (Japan)</description>
 		<year>1988</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-JO"/>
 		<info name="release" value="19880201"/>
-		<info name="alt_title" value="ジャンボ尾崎のホールインワン プロフェッショナル"/>
+		<info name="alt_title" value="ジャンボ尾崎のホールインワン・プロフェッショナル"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="sxrom" />
 			<feature name="pcb" value="HVC-SJROM" />
@@ -19413,7 +19417,7 @@ license:CC0
 	</software>
 
 	<software name="jumpink">
-		<description>Jumpin' Kid - Jack to Mame no Ki Monogatari (Jpn)</description>
+		<description>Jumpin' Kid - Jack to Mame no Ki Monogatari (Japan)</description>
 		<year>1990</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="ASM-J9"/>
@@ -19516,7 +19520,7 @@ license:CC0
 	</software>
 
 	<software name="justbred">
-		<description>Just Breed (Jpn)</description>
+		<description>Just Breed (Japan)</description>
 		<year>1992</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="EFC-I5"/>
@@ -19542,7 +19546,7 @@ license:CC0
 	</software>
 
 	<software name="metalstrj" cloneof="metalstr">
-		<description>Juuryoku Soukou Metal Storm (Jpn)</description>
+		<description>Juuryoku Soukou Metal Storm (Japan)</description>
 		<year>1992</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="TIX-4M (IF-21)"/>
@@ -19562,7 +19566,7 @@ license:CC0
 	</software>
 
 	<software name="juveiq1" cloneof="juveiq">
-		<description>Juvei Quest (Jpn)</description>
+		<description>Juvei Quest (Japan)</description>
 		<year>1991</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FJQ-7800"/>
@@ -19627,7 +19631,7 @@ license:CC0
 	</software>
 
 	<software name="kaetteki" supported="no">
-		<description>Kaettekita! Gunjin Shougi - Nanya Sore!? (Jpn)</description>
+		<description>Kaettekita! Gunjin Shougi - Nanya Sore!? (Japan)</description>
 		<year>1989</year>
 		<publisher>SOFEL</publisher>
 		<info name="serial" value="SFL-NS"/>
@@ -19647,7 +19651,7 @@ license:CC0
 	</software>
 
 	<software name="kage" cloneof="blueshad">
-		<description>Kage (Jpn)</description>
+		<description>Kage (Japan)</description>
 		<year>1990</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="NAT-JL"/>
@@ -19667,7 +19671,7 @@ license:CC0
 	</software>
 
 	<software name="legkagej" cloneof="legkage">
-		<description>Kage no Densetsu - The Legend of Kage (Jpn)</description>
+		<description>Kage no Densetsu - The Legend of Kage (Japan)</description>
 		<year>1986</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-KD-4900 (07)"/>
@@ -19687,7 +19691,7 @@ license:CC0
 	</software>
 
 	<software name="kagero">
-		<description>Kagerou Densetsu (Jpn)</description>
+		<description>Kagerou Densetsu (Japan)</description>
 		<year>1990</year>
 		<publisher>Pixel Technologies</publisher>
 		<info name="serial" value="PIX-XA-01"/>
@@ -19711,7 +19715,7 @@ license:CC0
 	</software>
 
 	<software name="kaguya">
-		<description>Kaguya Hime Densetsu (Jpn)</description>
+		<description>Kaguya Hime Densetsu (Japan)</description>
 		<year>1988</year>
 		<publisher>Victor Ongaku Sangyou</publisher>
 		<info name="serial" value="VFR-K1 (06)"/>
@@ -19735,7 +19739,7 @@ license:CC0
 	</software>
 
 	<software name="kaijumon">
-		<description>Kaijuu Monogatari (Jpn)</description>
+		<description>Kaijuu Monogatari - Shell Saurs Story (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-KM-5500"/>
@@ -19759,7 +19763,7 @@ license:CC0
 	</software>
 
 	<software name="kaikeyan" cloneof="kidniki">
-		<description>Kaiketsu Yanchamaru (Jpn)</description>
+		<description>Kaiketsu Yanchamaru (Japan)</description>
 		<year>1987</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-07"/>
@@ -19778,7 +19782,7 @@ license:CC0
 	</software>
 
 	<software name="kaikeya2">
-		<description>Kaiketsu Yanchamaru 2 - Karakuri Land (Jpn)</description>
+		<description>Kaiketsu Yanchamaru 2 - Karakuri Land (Japan)</description>
 		<year>1991</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-22"/>
@@ -19798,7 +19802,7 @@ license:CC0
 	</software>
 
 	<software name="kaikeya3">
-		<description>Kaiketsu Yanchamaru 3 - Taiketsu! Zouringen (Jpn)</description>
+		<description>Kaiketsu Yanchamaru 3 - Taiketsu! Zouringen (Japan)</description>
 		<year>1993</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-28"/>
@@ -19817,7 +19821,7 @@ license:CC0
 	</software>
 
 	<software name="kakefu" cloneof="kidkool">
-		<description>Kakefu-kun no Jump Tengoku - Speed Jigoku (Jpn)</description>
+		<description>Kakefu-kun no Jump Tengoku - Speed Jigoku (Japan)</description>
 		<year>1988</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="VIC-KX"/>
@@ -19837,7 +19841,7 @@ license:CC0
 	</software>
 
 	<software name="urashima" cloneof="xexyz">
-		<description>Kame no Ongaeshi - Urashima Densetsu (Jpn)</description>
+		<description>Kame no Ongaeshi - Urashima Densetsu (Japan)</description>
 		<year>1988</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-KO"/>
@@ -19857,7 +19861,7 @@ license:CC0
 	</software>
 
 	<software name="kamenrid">
-		<description>Kamen Rider Club - Gekitotsu Shocker Land (Jpn)</description>
+		<description>Kamen Rider Club - Gekitotsu Shocker Land (Japan)</description>
 		<year>1988</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-KAMEN"/>
@@ -19877,7 +19881,7 @@ license:CC0
 	</software>
 
 	<software name="kamenrsd">
-		<description>Kamen Rider SD - GranShocker no Yabou (Jpn)</description>
+		<description>Kamen Rider SD - GranShocker no Yabou (Japan)</description>
 		<year>1993</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="ANG-KA"/>
@@ -19901,7 +19905,7 @@ license:CC0
 	</software>
 
 	<software name="kameninj">
-		<description>Kamen no Ninja - Akakage (Jpn)</description>
+		<description>Kamen no Ninja - Akakage (Japan)</description>
 		<year>1988</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-AK"/>
@@ -19921,12 +19925,12 @@ license:CC0
 	</software>
 
 	<software name="kanshaku">
-		<description>Kanshakudama Nage Kantarou no Toukaidou Gojuusan Tsugi (Jpn)</description>
+		<description>Kanshakudama Nage Kantarou no Toukaidou Gojuusan Tsugi (Japan)</description>
 		<year>1986</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-TKR-4900 (SS5)"/>
 		<info name="release" value="19860703"/>
-		<info name="alt_title" value="東海道五十三次"/>
+		<info name="alt_title" value="かんしゃく玉なげカン太郎の東海道五十三次"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="sunsoft1" />
 			<feature name="pcb" value="SUNSOFT-1" />
@@ -19941,7 +19945,7 @@ license:CC0
 	</software>
 
 	<software name="karakuri">
-		<description>Karakuri Kengouden - Musashi Road - Karakuribito Hashiru! (Jpn)</description>
+		<description>Karakuri Kengouden - Musashi Road - Karakuribito Hashiru! (Japan)</description>
 		<year>1991</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHI-98"/>
@@ -20022,7 +20026,7 @@ license:CC0
 	</software>
 
 	<software name="karateka">
-		<description>Karateka (Jpn)</description>
+		<description>Karateka (Japan)</description>
 		<year>1985</year>
 		<publisher>Soft Pro</publisher>
 		<info name="serial" value="SFC-KR"/>
@@ -20043,7 +20047,7 @@ license:CC0
 	</software>
 
 	<software name="karnovj1" cloneof="karnov">
-		<description>Karnov (Jpn)</description>
+		<description>Karnov (Japan)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-KA-4900"/>
@@ -20082,7 +20086,7 @@ license:CC0
 	</software>
 
 	<software name="keibasim">
-		<description>Keiba Simulation - Honmei (Jpn)</description>
+		<description>Keiba Simulation - Honmei (Japan)</description>
 		<year>1989</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-KH (08)"/>
@@ -20102,7 +20106,7 @@ license:CC0
 	</software>
 
 	<software name="kerodai">
-		<description>Kero Kero Keroppi no Daibouken (Jpn)</description>
+		<description>Kero Kero Keroppi no Daibouken (Japan)</description>
 		<year>1991</year>
 		<publisher>Character Soft</publisher>
 		<info name="serial" value="CTS-ZI"/>
@@ -20122,7 +20126,7 @@ license:CC0
 	</software>
 
 	<software name="kerosplb">
-		<description>Keroppi to Keroleen no Splash Bomb! (Jpn)</description>
+		<description>Keroppi to Keroleen no Splash Bomb! (Japan)</description>
 		<year>1993</year>
 		<publisher>Character Soft</publisher>
 		<info name="serial" value="CTS-SY"/>
@@ -20142,7 +20146,7 @@ license:CC0
 	</software>
 
 	<software name="questki">
-		<description>Ki no Bouken - The Quest of Ki (Jpn)</description>
+		<description>Ki no Bouken - The Quest of Ki (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-QK-3900"/>
@@ -20380,7 +20384,7 @@ license:CC0
 	</software>
 
 	<software name="kingkon2">
-		<description>King Kong 2 - Ikari no Megaton Punch (Jpn)</description>
+		<description>King Kong 2 - Ikari no Megaton Punch (Japan)</description>
 		<year>1986</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC816"/>
@@ -20417,7 +20421,7 @@ license:CC0
 	</software>
 
 	<software name="kingof">
-		<description>King of Kings (Jpn)</description>
+		<description>King of Kings (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-KK-5900"/>
@@ -20579,7 +20583,7 @@ license:CC0
 	</software>
 
 	<software name="musclej1" cloneof="muscle">
-		<description>Kinnikuman - MUSCLE Tag Match (Jpn)</description>
+		<description>Kinnikuman - MUSCLE Tag Match (Japan)</description>
 		<year>1985</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-KIN"/>
@@ -20600,7 +20604,7 @@ license:CC0
 	</software>
 
 	<software name="musclej" cloneof="muscle">
-		<description>Kinnikuman - MUSCLE Tag Match (Jpn, v1.1)</description>
+		<description>Kinnikuman - MUSCLE Tag Match (Japan, v1.1)</description>
 		<year>1985</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-KIN"/>
@@ -20938,7 +20942,7 @@ license:CC0
 	</software>
 
 	<software name="waiwai">
-		<description>Konami Wai Wai World (Jpn)</description>
+		<description>Konami Wai Wai World (Japan)</description>
 		<year>1988</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC825"/>
@@ -20967,7 +20971,7 @@ license:CC0
 	</software>
 
 	<software name="konseul" cloneof="trackfl2">
-		<description>Konamic Sports in Seoul (Jpn)</description>
+		<description>Konamic Sports in Seoul (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-F2"/>
@@ -20987,7 +20991,7 @@ license:CC0
 	</software>
 
 	<software name="koshien">
-		<description>Koushien (Jpn)</description>
+		<description>Koushien (Japan)</description>
 		<year>1989</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="KAC-KQ"/>
@@ -21103,7 +21107,7 @@ license:CC0
 	</software>
 
 	<software name="kujaku">
-		<description>Kujaku Ou (Jpn)</description>
+		<description>Kujaku Ou (Japan)</description>
 		<year>1988</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-KZ (R58V5916)"/>
@@ -21123,7 +21127,7 @@ license:CC0
 	</software>
 
 	<software name="kujaku2">
-		<description>Kujaku Ou 2 (Jpn)</description>
+		<description>Kujaku Ou 2 (Japan)</description>
 		<year>1990</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-QW (R68V5932)"/>
@@ -21205,7 +21209,7 @@ license:CC0
 	</software>
 
 	<software name="kunioscr">
-		<description>Kunio-kun no Nekketsu Soccer League (Jpn)</description>
+		<description>Kunio-kun no Nekketsu Soccer League (Japan)</description>
 		<year>1993</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-NV"/>
@@ -21226,7 +21230,7 @@ license:CC0
 	</software>
 
 	<software name="kachiuma">
-		<description>Kurogane Hiroshi no Yosou Daisuki! Kachiuma Densetsu (Jpn)</description>
+		<description>Kurogane Hiroshi no Yosou Daisuki! Kachiuma Densetsu (Japan)</description>
 		<year>1990</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-R7 (09)"/>
@@ -21250,7 +21254,7 @@ license:CC0
 	</software>
 
 	<software name="kyattont">
-		<description>Kyattou Ninden Teyandee (Jpn)</description>
+		<description>Kyattou Ninden Teyandee (Japan)</description>
 		<year>1991</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-Y8"/>
@@ -21271,7 +21275,7 @@ license:CC0
 
 <!-- Possibly coming from a proto / sample cart? PCB has wires that are not present in the other verified PCBs... -->
 	<software name="kyonshi2a" cloneof="kyonshi2">
-		<description>Kyonshiizu 2 (Jpn)</description>
+		<description>Kyonshiizu 2 (Japan)</description>
 		<year>1987</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-KR-5500 (12)"/>
@@ -21296,7 +21300,7 @@ license:CC0
 	</software>
 
 	<software name="kyonshi2">
-		<description>Kyonshiizu 2 (Jpn, v1.1)</description>
+		<description>Kyonshiizu 2 (Japan, v1.1)</description>
 		<year>1987</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-KR-5500 (12)"/>
@@ -21344,7 +21348,7 @@ license:CC0
 	</software>
 
 	<software name="khstad">
-		<description>Kyuukyoku Harikiri Stadium (Jpn)</description>
+		<description>Kyuukyoku Harikiri Stadium (Japan)</description>
 		<year>1988</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-KHS-5500 (18)"/>
@@ -21369,7 +21373,7 @@ license:CC0
 	</software>
 
 	<software name="khstad88">
-		<description>Kyuukyoku Harikiri Stadium - '88 Senshu Shin Data (Jpn, v2.0)</description>
+		<description>Kyuukyoku Harikiri Stadium - '88 Senshu Shin Data (Japan, v2.0)</description>
 		<year>1988</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-KHS-5500 (18)"/>
@@ -21440,7 +21444,7 @@ license:CC0
 	</software>
 
 	<software name="ktiger" cloneof="twincobr">
-		<description>Kyuukyoku Tiger (Jpn)</description>
+		<description>Kyuukyoku Tiger (Japan)</description>
 		<year>1989</year>
 		<publisher>CBS / Sony Group</publisher>
 		<info name="serial" value="CBS-QT"/>
@@ -21488,7 +21492,7 @@ license:CC0
 	</software>
 
 	<software name="emperorj" cloneof="emperor" supported="partial">
-		<description>L'Empereur (Jpn)</description>
+		<description>L'Empereur (Japan)</description>
 		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-QV"/>
@@ -21517,7 +21521,7 @@ license:CC0
 	</software>
 
 	<software name="labyrint">
-		<description>Labyrinth (Jpn)</description>
+		<description>Labyrinth - Maou no Meikyuu (Japan)</description>
 		<year>1987</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="GTS-LA"/>
@@ -21537,7 +21541,7 @@ license:CC0
 	</software>
 
 	<software name="lagrange">
-		<description>Lagrange Point (Jpn)</description>
+		<description>Lagrange Point (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC851"/>
@@ -21601,7 +21605,7 @@ license:CC0
 	</software>
 
 	<software name="lastarmg">
-		<description>Last Armageddon (Jpn)</description>
+		<description>Last Armageddon (Japan)</description>
 		<year>1990</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHI-LT"/>
@@ -21663,7 +21667,7 @@ license:CC0
 	</software>
 
 	<software name="lawwest">
-		<description>Law of the West (Jpn)</description>
+		<description>Law of the West (Japan)</description>
 		<year>1987</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-LW (R53V5907)"/>
@@ -21683,7 +21687,7 @@ license:CC0
 	</software>
 
 	<software name="layla">
-		<description>Layla (Jpn)</description>
+		<description>Layla (Japan)</description>
 		<year>1986</year>
 		<publisher>dB-SOFT</publisher>
 		<info name="serial" value="DBF-LY"/>
@@ -22129,7 +22133,7 @@ license:CC0
 	</software>
 
 	<software name="lilmagic">
-		<description>Little Magic (Jpn)</description>
+		<description>Little Magic (Japan)</description>
 		<year>1990</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-LG"/>
@@ -22179,7 +22183,7 @@ license:CC0
 	</software>
 
 	<software name="mermaidj" cloneof="mermaid">
-		<description>Little Mermaid - Ningyo Hime (Jpn)</description>
+		<description>Little Mermaid - Ningyo Hime (Japan)</description>
 		<year>1991</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-3U"/>
@@ -22313,7 +22317,7 @@ license:CC0
 	</software>
 
 	<software name="ldrunj" cloneof="ldrun">
-		<description>Lode Runner (Jpn)</description>
+		<description>Lode Runner (Japan)</description>
 		<year>1984</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-LR"/>
@@ -22393,7 +22397,7 @@ license:CC0
 	</software>
 
 	<software name="lordking" cloneof="astyanax">
-		<description>The Lord of King (Jpn)</description>
+		<description>The Lord of King (Japan)</description>
 		<year>1989</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-25"/>
@@ -22412,7 +22416,7 @@ license:CC0
 	</software>
 
 	<software name="wordjen">
-		<description>Lost Word of Jenny - Ushinawareta Message (Jpn)</description>
+		<description>Lost Word of Jenny - Ushinawareta Message (Japan)</description>
 		<year>1987</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="TFC-JN"/>
@@ -22432,7 +22436,7 @@ license:CC0
 	</software>
 
 	<software name="lotlot">
-		<description>Lot Lot (Jpn)</description>
+		<description>Lot Lot (Japan)</description>
 		<year>1985</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="GTS-LL"/>
@@ -22489,7 +22493,7 @@ license:CC0
 	</software>
 
 	<software name="lunarbal" cloneof="lunarpol">
-		<description>Lunar Ball (Jpn)</description>
+		<description>Lunar Ball (Japan)</description>
 		<year>1985</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-LB (R49V5902)"/>
@@ -22548,7 +22552,7 @@ license:CC0
 	</software>
 
 	<software name="lupin3">
-		<description>Lupin Sansei - Pandora no Isan (Jpn)</description>
+		<description>Lupin Sansei - Pandora no Isan (Japan)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-LP-3900"/>
@@ -22730,7 +22734,7 @@ license:CC0
 	</software>
 
 	<software name="madcity" cloneof="bayoubil">
-		<description>Mad City (Jpn)</description>
+		<description>Mad City (Japan)</description>
 		<year>1988</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-MU"/>
@@ -22770,7 +22774,7 @@ license:CC0
 	</software>
 
 	<software name="magmaxj" cloneof="magmax">
-		<description>MagMax (Jpn)</description>
+		<description>MagMax (Japan)</description>
 		<year>1986</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-MM (01)"/>
@@ -22790,7 +22794,7 @@ license:CC0
 	</software>
 
 	<software name="magicdrtj" cloneof="magicdrt">
-		<description>Magic Darts (Jpn)</description>
+		<description>Magic Darts (Japan)</description>
 		<year>1991</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="KKS-4R (06)"/>
@@ -22829,7 +22833,7 @@ license:CC0
 	</software>
 
 	<software name="magjohn" cloneof="totalrad">
-		<description>Magic John (Jpn)</description>
+		<description>Magic John (Japan)</description>
 		<year>1990</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-30"/>
@@ -22910,7 +22914,7 @@ license:CC0
 	</software>
 
 	<software name="mtaruru2">
-		<description>Magical Taruruuto-kun 2 - Mahou Daibouken (Jpn)</description>
+		<description>Magical Taruruuto-kun 2 - Mahou Daibouken (Japan)</description>
 		<year>1992</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-MT2"/>
@@ -22929,7 +22933,7 @@ license:CC0
 	</software>
 
 	<software name="mtarurua" cloneof="mtaruru">
-		<description>Magical Taruruuto-kun - Fantastic World!! (Jpn)</description>
+		<description>Magical Taruruuto-kun - Fantastic World!! (Japan)</description>
 		<year>1991</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-MT"/>
@@ -23257,7 +23261,7 @@ license:CC0
 	</software>
 
 	<software name="mleague">
-		<description>Major League (Jpn)</description>
+		<description>Major League (Japan)</description>
 		<year>1989</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-13"/>
@@ -23335,7 +23339,7 @@ license:CC0
 	</software>
 
 	<software name="gngj" cloneof="gng">
-		<description>Makaimura (Jpn)</description>
+		<description>Makaimura (Japan)</description>
 		<year>1986</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-MK"/>
@@ -24235,7 +24239,7 @@ license:CC0
 	</software>
 
 	<software name="megamit2a" cloneof="megamit2">
-		<description>Megami Tensei II - Digital Devil Story (Jpn)</description>
+		<description>Megami Tensei II - Digital Devil Story (Japan)</description>
 		<year>1990</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FMT-7800"/>
@@ -24262,7 +24266,7 @@ license:CC0
 	</software>
 
 	<software name="megamit">
-		<description>Megami Tensei - Digital Devil Story (Jpn)</description>
+		<description>Megami Tensei - Digital Devil Story (Japan)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-MT-4900"/>
@@ -24282,7 +24286,7 @@ license:CC0
 	</software>
 
 	<software name="meikyujm" cloneof="kickle">
-		<description>Meikyuu Jima (Jpn)</description>
+		<description>Meikyuu Jima (Japan)</description>
 		<year>1990</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-18"/>
@@ -24302,7 +24306,7 @@ license:CC0
 	</software>
 
 	<software name="milonj" cloneof="milon">
-		<description>Meikyuu Kumikyoku - Milon no Daibouken (Jpn)</description>
+		<description>Meikyuu Kumikyoku - Milon no Daibouken (Japan)</description>
 		<year>1986</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-KM"/>
@@ -24322,7 +24326,7 @@ license:CC0
 	</software>
 
 	<software name="dai3yak">
-		<description>Meimon! Dai San Yakyuu Bu (Jpn)</description>
+		<description>Meimon! Dai San Yakyuu Bu (Japan)</description>
 		<year>1989</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-DAI3"/>
@@ -24341,7 +24345,7 @@ license:CC0
 	</software>
 
 	<software name="mtok6ns">
-		<description>Meimon! Takonishi Ouendan - Kouha 6 Nin Shuu (Jpn)</description>
+		<description>Meimon! Takonishi Ouendan - Kouha 6 Nin Shuu (Japan)</description>
 		<year>1989</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="ASM-T1"/>
@@ -24457,7 +24461,7 @@ license:CC0
 	</software>
 
 	<software name="mgearj" cloneof="mgear">
-		<description>Metal Gear (Jpn)</description>
+		<description>Metal Gear (Japan)</description>
 		<year>1987</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-ME (RC824)"/>
@@ -24515,7 +24519,7 @@ license:CC0
 	</software>
 
 	<software name="metalmax">
-		<description>Metal Max (Jpn)</description>
+		<description>Metal Max (Japan)</description>
 		<year>1991</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-26"/>
@@ -24559,7 +24563,7 @@ license:CC0
 	</software>
 
 	<software name="msladerg" supported="partial">
-		<description>Metal Slader Glory (Jpn)</description>
+		<description>Metal Slader Glory (Japan)</description>
 		<year>1991</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-4J"/>
@@ -24603,7 +24607,7 @@ license:CC0
 	</software>
 
 	<software name="metrox">
-		<description>Metro-Cross (Jpn)</description>
+		<description>Metro-Cross (Japan)</description>
 		<year>1986</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-MC-3900"/>
@@ -24667,7 +24671,7 @@ license:CC0
 	</software>
 
 	<software name="pachikun">
-		<description>Mezase Pachi Pro - Pachio-kun (Jpn)</description>
+		<description>Mezase Pachi Pro - Pachio-kun (Japan)</description>
 		<year>1987</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-PA"/>
@@ -24729,7 +24733,7 @@ license:CC0
 	</software>
 
 	<software name="mickey3" cloneof="kidklown">
-		<description>Mickey Mouse III - Yume Fuusen (Jpn)</description>
+		<description>Mickey Mouse III - Yume Fuusen (Japan)</description>
 		<year>1992</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KTB-MD"/>
@@ -24752,7 +24756,7 @@ license:CC0
 	</software>
 
 	<software name="mickeyj" cloneof="mickey">
-		<description>Mickey Mouse - Fushigi no Kuni do Daibouken (Jpn)</description>
+		<description>Mickey Mouse - Fushigi no Kuni do Daibouken (Japan)</description>
 		<year>1987</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-MI"/>
@@ -24868,7 +24872,7 @@ license:CC0
 	</software>
 
 	<software name="mightmagj" cloneof="mightmag">
-		<description>Might and Magic - Book One - Secret of the Inner Sanctum (Jpn)</description>
+		<description>Might and Magic - Book One - Secret of the Inner Sanctum (Japan)</description>
 		<year>1990</year>
 		<publisher>Gakken</publisher>
 		<info name="serial" value="GAT-MP"/>
@@ -24915,7 +24919,7 @@ license:CC0
 	</software>
 
 	<software name="mightybjj1" cloneof="mightybj">
-		<description>Mighty Bomb Jack (Jpn)</description>
+		<description>Mighty Bomb Jack (Japan)</description>
 		<year>1986</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-MB"/>
@@ -24976,7 +24980,7 @@ license:CC0
 	</software>
 
 	<software name="mffightj" cloneof="mffight">
-		<description>Mighty Final Fight (Jpn)</description>
+		<description>Mighty Final Fight (Japan)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-SD"/>
@@ -25052,7 +25056,7 @@ license:CC0
 	</software>
 
 	<software name="tysonpoju" cloneof="tysonpo">
-		<description>Mike Tyson's Punch-Out!! (Japan, USA, rev. A)</description><!-- Dump still to be confirmed from a Jpn cart -->
+		<description>Mike Tyson's Punch-Out!! (Japan, USA, rev. A)</description><!-- Dump still to be confirmed from a Japan cart -->
 		<year>1987</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="NES-PT-USA"/>
@@ -25145,7 +25149,7 @@ license:CC0
 	</software>
 
 	<software name="mindseek">
-		<description>Mindseeker (Jpn)</description>
+		<description>Mindseeker (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-MS-6500"/>
@@ -25169,7 +25173,7 @@ license:CC0
 	</software>
 
 	<software name="minelvtn">
-		<description>Minelvaton Saga - Ragon no Fukkatsu (Jpn)</description>
+		<description>Minelvaton Saga - Ragon no Fukkatsu (Japan)</description>
 		<year>1987</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-MS-5500 (13)"/>
@@ -25194,7 +25198,7 @@ license:CC0
 	</software>
 
 	<software name="miniputt">
-		<description>Mini Putt (Jpn)</description>
+		<description>Mini Putt (Japan)</description>
 		<year>1991</year>
 		<publisher>A-Wave</publisher>
 		<info name="serial" value="WAV-Q6 (11)"/>
@@ -25299,7 +25303,7 @@ license:CC0
 	</software>
 
 	<software name="lios">
-		<description>Mirai Senshi - Lios (Jpn)</description>
+		<description>Mirai Senshi - Lios (Japan)</description>
 		<year>1989</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="PAC-R6"/>
@@ -25323,7 +25327,7 @@ license:CC0
 	</software>
 
 	<software name="jarvas">
-		<description>Mirai Shinwa Jarvas (Jpn)</description>
+		<description>Mirai Shinwa Jarvas (Japan)</description>
 		<year>1987</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-MJ-5500 (11)"/>
@@ -25405,7 +25409,7 @@ license:CC0
 	</software>
 
 	<software name="mississpa" cloneof="mississp">
-		<description>Mississippi Satsujin Jiken - Murder on the Mississippi (Jpn)</description>
+		<description>Mississippi Satsujin Jiken - Murder on the Mississippi (Japan)</description>
 		<year>1986</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-11"/>
@@ -25425,7 +25429,7 @@ license:CC0
 	</software>
 
 	<software name="mitokom">
-		<description>Mito Koumon - Sekai Manyuu Ki (Jpn)</description>
+		<description>Mito Koumon - Sekai Manyuu Ki (Japan)</description>
 		<year>1988</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-MKII-5500 (SS11)"/>
@@ -25444,7 +25448,7 @@ license:CC0
 	</software>
 
 	<software name="mitsumgt">
-		<description>Mitsume ga Tooru (Jpn)</description>
+		<description>Mitsume ga Tooru (Japan)</description>
 		<year>1992</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="TOM-3M"/>
@@ -25464,7 +25468,7 @@ license:CC0
 	</software>
 
 	<software name="mizushim">
-		<description>Mizushima Shinji no Dai Koushien (Jpn)</description>
+		<description>Mizushima Shinji no Dai Koushien (Japan)</description>
 		<year>1990</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="STE-VC"/>
@@ -25484,7 +25488,7 @@ license:CC0
 	</software>
 
 	<software name="moepro90" cloneof="basload3">
-		<description>Moe Pro! '90 - Kandou-hen (Jpn)</description>
+		<description>Moe Pro! '90 - Kandou-hen (Japan)</description>
 		<year>1990</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-29"/>
@@ -25506,7 +25510,7 @@ license:CC0
 	</software>
 
 	<software name="moepro" cloneof="basload4">
-		<description>Moe Pro! - Saikyou-hen (Jpn)</description>
+		<description>Moe Pro! - Saikyou-hen (Japan)</description>
 		<year>1991</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-33"/>
@@ -25528,7 +25532,7 @@ license:CC0
 	</software>
 
 	<software name="moebaskt" cloneof="hoops">
-		<description>Moero!! Junior Basket - Two on Two (Jpn)</description>
+		<description>Moero!! Junior Basket - Two on Two (Japan)</description>
 		<year>1988</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-20"/>
@@ -25567,7 +25571,7 @@ license:CC0
 	</software>
 
 	<software name="moetenn" cloneof="racketat">
-		<description>Moero!! Pro Tennis (Jpn)</description>
+		<description>Moero!! Pro Tennis (Japan)</description>
 		<year>1988</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-17"/>
@@ -25590,7 +25594,7 @@ license:CC0
 	</software>
 
 	<software name="moeproyc" cloneof="basload">
-		<description>Moero!! Pro Yakyuu (Jpn, v1.0)</description>
+		<description>Moero!! Pro Yakyuu (Japan, v1.0)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-13"/>
@@ -25613,7 +25617,7 @@ license:CC0
 	</software>
 
 	<software name="moeproyb" cloneof="basload">
-		<description>Moero!! Pro Yakyuu (Jpn, v1.1)</description>
+		<description>Moero!! Pro Yakyuu (Japan, v1.1)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-13"/>
@@ -25636,7 +25640,7 @@ license:CC0
 	</software>
 
 	<software name="moeproya" cloneof="basload">
-		<description>Moero!! Pro Yakyuu (Jpn, v1.2)</description>
+		<description>Moero!! Pro Yakyuu (Japan, v1.2)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-13"/>
@@ -25659,7 +25663,7 @@ license:CC0
 	</software>
 
 	<software name="moeproy" cloneof="basload">
-		<description>Moero!! Pro Yakyuu (Jpn, v1.3)</description>
+		<description>Moero!! Pro Yakyuu (Japan, v1.3)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-13"/>
@@ -25682,7 +25686,7 @@ license:CC0
 	</software>
 
 	<software name="moeproy88" cloneof="basload2">
-		<description>Moero!! Pro Yakyuu '88 - Kettei Ban (Jpn)</description>
+		<description>Moero!! Pro Yakyuu '88 - Kettei Ban (Japan)</description>
 		<year>1988</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-19"/>
@@ -25705,7 +25709,7 @@ license:CC0
 	</software>
 
 	<software name="momo">
-		<description>Momotarou Densetsu - Peach Boy Legend (Jpn)</description>
+		<description>Momotarou Densetsu - Peach Boy Legend (Japan)</description>
 		<year>1987</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-MO"/>
@@ -25725,7 +25729,7 @@ license:CC0
 	</software>
 
 	<software name="momodent">
-		<description>Momotarou Dentetsu (Jpn)</description>
+		<description>Momotarou Dentetsu (Japan)</description>
 		<year>1988</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-M2"/>
@@ -25745,7 +25749,7 @@ license:CC0
 	</software>
 
 	<software name="moneygm2">
-		<description>The Money Game 2 - Kabutochou no Kiseki (Jpn)</description>
+		<description>The Money Game 2 - Kabutochou no Kiseki (Japan)</description>
 		<year>1989</year>
 		<publisher>Sofel</publisher>
 		<info name="serial" value="SFL-ZM"/>
@@ -25766,7 +25770,7 @@ license:CC0
 	</software>
 
 	<software name="moneygam">
-		<description>The Money Game (Jpn)</description>
+		<description>The Money Game (Japan)</description>
 		<year>1988</year>
 		<publisher>SOFEL</publisher>
 		<info name="serial" value="SFL-MY"/>
@@ -25790,7 +25794,7 @@ license:CC0
 	</software>
 
 	<software name="monopolyj" cloneof="monopoly">
-		<description>Monopoly (Jpn)</description>
+		<description>Monopoly (Japan)</description>
 		<year>1991</year>
 		<publisher>Tomy</publisher>
 		<info name="serial" value="TOM-6B"/>
@@ -25903,7 +25907,7 @@ license:CC0
 	</software>
 
 	<software name="monstmkr">
-		<description>Monster Maker - 7 Tsu no Hihou (Jpn)</description>
+		<description>Monster Maker - 7 Tsu no Hihou (Japan)</description>
 		<year>1991</year>
 		<publisher>Sofel</publisher>
 		<info name="serial" value="SFL-7N"/>
@@ -25965,7 +25969,7 @@ license:CC0
 	</software>
 
 	<software name="moritash">
-		<description>Morita Shougi (Jpn)</description>
+		<description>Morita Shougi (Japan)</description>
 		<year>1987</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="KKS-MC (02)"/>
@@ -25989,7 +25993,7 @@ license:CC0
 	</software>
 
 	<software name="mother" cloneof="earthbnd" supported="partial">
-		<description>Mother (Jpn)</description>
+		<description>Mother (Japan)</description>
 		<year>1989</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-MX"/>
@@ -26012,7 +26016,7 @@ license:CC0
 	</software>
 
 	<software name="motochmp">
-		<description>Motocross Champion (Jpn)</description>
+		<description>Motocross Champion (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-CX"/>
@@ -26051,7 +26055,7 @@ license:CC0
 	</software>
 
 	<software name="melville">
-		<description>Moulin Rouge Senki - Melville no Honoo (Jpn)</description>
+		<description>Moulin Rouge Senki - Melville no Honoo (Japan)</description>
 		<year>1989</year>
 		<publisher>Gakushu Kenkyusha</publisher>
 		<info name="serial" value="GAT-M6"/>
@@ -26075,7 +26079,7 @@ license:CC0
 	</software>
 
 	<software name="madara">
-		<description>Mouryou Senki Madara (Jpn)</description>
+		<description>Mouryou Senki Madara (Japan)</description>
 		<year>1990</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC846"/>
@@ -26175,7 +26179,7 @@ license:CC0
 	</software>
 
 	<software name="musashib">
-		<description>Musashi no Bouken (Jpn)</description>
+		<description>Musashi no Bouken (Japan)</description>
 		<year>1990</year>
 		<publisher>Sigma Shouji</publisher>
 		<info name="serial" value="SEI-IC"/>
@@ -26199,7 +26203,7 @@ license:CC0
 	</software>
 
 	<software name="musashik">
-		<description>Musashi no Ken - Tadaima Shugyou Chuu (Jpn)</description>
+		<description>Musashi no Ken - Tadaima Shugyou Chuu (Japan)</description>
 		<year>1986</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-MK-4900 (08)"/>
@@ -26397,7 +26401,7 @@ license:CC0
 	</software>
 
 	<software name="naganeko">
-		<description>Nagagutsu o Haita Neko - Sekai Isshuu 80-nichi Daibouken (Jpn)</description>
+		<description>Nagagutsu o Haita Neko - Sekai Isshuu 80-nichi Daibouken (Japan)</description>
 		<year>1986</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-NN"/>
@@ -26417,7 +26421,7 @@ license:CC0
 	</software>
 
 	<software name="f1hero" cloneof="andretti">
-		<description>Nakajima Satoru F-1 Hero (Jpn)</description>
+		<description>Nakajima Satoru F-1 Hero (Japan)</description>
 		<year>1988</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="VRE-F1"/>
@@ -26437,7 +26441,7 @@ license:CC0
 	</software>
 
 	<software name="f1hero2">
-		<description>Nakajima Satoru - F-1 Hero 2 (Jpn)</description>
+		<description>Nakajima Satoru - F-1 Hero 2 (Japan)</description>
 		<year>1991</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="VAR-4E"/>
@@ -26457,7 +26461,7 @@ license:CC0
 	</software>
 
 	<software name="namcocls">
-		<description>Namco Classic (Jpn)</description>
+		<description>Namco Classic (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NC-5900"/>
@@ -26480,7 +26484,7 @@ license:CC0
 	</software>
 
 	<software name="namcocl2">
-		<description>Namco Classic II (Jpn)</description>
+		<description>Namco Classic II (Japan)</description>
 		<year>1992</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FN2-5900"/>
@@ -26503,7 +26507,7 @@ license:CC0
 	</software>
 
 	<software name="namcomj3">
-		<description>Namco Mahjong III - Mahjong Tengoku (Jpn)</description>
+		<description>Namcot Mahjong III - Mahjong Tengoku (Japan)</description>
 		<year>1991</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NM3-4900"/>
@@ -26523,7 +26527,7 @@ license:CC0
 	</software>
 
 	<software name="nangsspy">
-		<description>Nangoku Shirei!! Spy vs. Spy (Jpn)</description>
+		<description>Nangoku Shirei!! Spy vs. Spy (Japan)</description>
 		<year>1987</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-SI"/>
@@ -26543,7 +26547,7 @@ license:CC0
 	</software>
 
 	<software name="nantbb">
-		<description>Nantettatte!! Baseball (Jpn)</description>
+		<description>Nantettatte!! Baseball (Japan)</description>
 		<year>1990</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-NTB-5900"/>
@@ -26566,7 +26570,7 @@ license:CC0
 	</software>
 
 	<software name="napoleon">
-		<description>Napoleon Senki (Jpn)</description>
+		<description>Napoleon Senki (Japan)</description>
 		<year>1988</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-09"/>
@@ -26589,7 +26593,7 @@ license:CC0
 	</software>
 
 	<software name="navyblue">
-		<description>Navy Blue (Jpn)</description>
+		<description>Navy Blue (Japan)</description>
 		<year>1992</year>
 		<publisher>I'Max</publisher>
 		<info name="serial" value="IMX-NB"/>
@@ -26612,7 +26616,7 @@ license:CC0
 	</software>
 
 	<software name="nekkakud">
-		<description>Nekketsu Kakutou Densetsu (Jpn)</description>
+		<description>Nekketsu Kakutou Densetsu (Japan)</description>
 		<year>1992</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-NA"/>
@@ -26632,7 +26636,7 @@ license:CC0
 	</software>
 
 	<software name="kuniokun" cloneof="renegade">
-		<description>Nekketsu Kouha Kunio-kun (Jpn)</description>
+		<description>Nekketsu Kouha Kunio-kun (Japan)</description>
 		<year>1987</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-KN"/>
@@ -26652,7 +26656,7 @@ license:CC0
 	</software>
 
 	<software name="nekdodge" cloneof="sdodgeb">
-		<description>Nekketsu Koukou Dodgeball Bu (Jpn)</description>
+		<description>Nekketsu Koukou Dodgeball Bu (Japan)</description>
 		<year>1988</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-ND"/>
@@ -26672,7 +26676,7 @@ license:CC0
 	</software>
 
 	<software name="neksoccr" cloneof="nintenwc">
-		<description>Nekketsu Koukou Dodgeball Bu - Soccer-hen (Jpn)</description>
+		<description>Nekketsu Koukou Dodgeball Bu - Soccer-hen (Japan)</description>
 		<year>1990</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-N3"/>
@@ -26693,7 +26697,7 @@ license:CC0
 	</software>
 
 	<software name="nemoj" cloneof="nemo">
-		<description>Nemo - Pajama Hero (Jpn)</description>
+		<description>Nemo - Pajama Hero (Japan)</description>
 		<year>1990</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-EZ"/>
@@ -26731,7 +26735,7 @@ license:CC0
 	</software>
 
 	<software name="nghostb2j" cloneof="nghostb2">
-		<description>New Ghostbusters II (Jpn)</description>
+		<description>New Ghostbusters II (Japan)</description>
 		<year>1990</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-QD"/>
@@ -26751,7 +26755,7 @@ license:CC0
 	</software>
 
 	<software name="nynyank" cloneof="rockinkt">
-		<description>New York Nyankies (Jpn)</description>
+		<description>New York Nyankies (Japan)</description>
 		<year>1991</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="ATL-7A"/>
@@ -26791,7 +26795,7 @@ license:CC0
 	</software>
 
 	<software name="nichimj3">
-		<description>Nichibutsu Mahjong III - Mahjong G Men (Jpn)</description>
+		<description>Nichibutsu Mahjong III - Mahjong G Men (Japan)</description>
 		<year>1990</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-JX (10)"/>
@@ -26890,7 +26894,7 @@ license:CC0
 	</software>
 
 	<software name="silkroad">
-		<description>Niji no Silk Road - Zig Zag Boukenki (Jpn)</description>
+		<description>Niji no Silk Road - Zig Zag Boukenki (Japan)</description>
 		<year>1991</year>
 		<publisher>Victor Ongaku Sangyou</publisher>
 		<info name="serial" value="VFR-L1 (07)"/>
@@ -26914,7 +26918,7 @@ license:CC0
 	</software>
 
 	<software name="deadfox" cloneof="cnviper">
-		<description>Ningen Heiki - Dead Fox (Jpn)</description>
+		<description>Ningen Heiki - Dead Fox (Japan)</description>
 		<year>1990</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-VP"/>
@@ -26934,7 +26938,7 @@ license:CC0
 	</software>
 
 	<software name="ninjacop" cloneof="blackmnt">
-		<description>Ninja Cop Saizou (Jpn)</description>
+		<description>Ninja Cop Saizou (Japan)</description>
 		<year>1989</year>
 		<publisher>Kyugo Boueki</publisher>
 		<info name="serial" value="KYG-NX"/>
@@ -27050,7 +27054,7 @@ license:CC0
 	</software>
 
 	<software name="ninjajaj">
-		<description>Ninja Jajamaru-kun (Jpn)</description>
+		<description>Ninja Jajamaru-kun (Japan)</description>
 		<year>1985</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-06"/>
@@ -27110,7 +27114,7 @@ license:CC0
 	</software>
 
 	<software name="nryukend" cloneof="shadwarr">
-		<description>Ninja Ryukenden (Jpn)</description>
+		<description>Ninja Ryukenden (Japan)</description>
 		<year>1988</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-NY"/>
@@ -27130,7 +27134,7 @@ license:CC0
 	</software>
 
 	<software name="nryuken2" cloneof="shadwar2" supported="partial">
-		<description>Ninja Ryukenden II - Ankoku no Jashinken (Jpn)</description>
+		<description>Ninja Ryukenden II - Ankoku no Jashinken (Japan)</description>
 		<year>1990</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-NW"/>
@@ -27150,7 +27154,7 @@ license:CC0
 	</software>
 
 	<software name="nryuken3" cloneof="ngaiden3">
-		<description>Ninja Ryukenden III - Yomi no Hakobune (Jpn)</description>
+		<description>Ninja Ryukenden III - Yomi no Hakobune (Japan)</description>
 		<year>1991</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-3N"/>
@@ -27170,7 +27174,7 @@ license:CC0
 	</software>
 
 	<software name="ninjakun1" cloneof="ninjakun">
-		<description>Ninja-kun - Majou no Bouken (Jpn)</description>
+		<description>Ninja-kun - Majou no Bouken (Japan)</description>
 		<year>1985</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-03"/>
@@ -27191,7 +27195,7 @@ license:CC0
 	</software>
 
 	<software name="ninjakun">
-		<description>Ninja-kun - Majou no Bouken (Jpn, v1.1)</description>
+		<description>Ninja-kun - Majou no Bouken (Japan, v1.1)</description>
 		<year>1985</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-03"/>
@@ -27212,7 +27216,7 @@ license:CC0
 	</software>
 
 	<software name="ninjarah">
-		<description>Ninjara Hoi! (Jpn)</description>
+		<description>Ninjara Hoi! (Japan)</description>
 		<year>1990</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-34"/>
@@ -27318,7 +27322,7 @@ license:CC0
 	</software>
 
 	<software name="nkbluet">
-		<description>Nishimura Kyoutarou Mystery - Blue Train Satsujin Jiken (Jpn)</description>
+		<description>Nishimura Kyoutarou Mystery - Blue Train Satsujin Jiken (Japan)</description>
 		<year>1989</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-11"/>
@@ -27338,7 +27342,7 @@ license:CC0
 	</software>
 
 	<software name="nksupexp">
-		<description>Nishimura Kyoutarou Mystery - Super Express Satsujin Jiken (Jpn)</description>
+		<description>Nishimura Kyoutarou Mystery - Super Express Satsujin Jiken (Japan)</description>
 		<year>1990</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="TIX-Z4 (IF-17)"/>
@@ -27381,7 +27385,7 @@ license:CC0
 	</software>
 
 	<software name="nobubufua" cloneof="nobubufu">
-		<description>Nobunaga no Yabou - Bushou Fuuunroku (Jpn)</description>
+		<description>Nobunaga no Yabou - Bushou Fuuunroku (Japan)</description>
 		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-IZ"/>
@@ -27407,7 +27411,7 @@ license:CC0
 	</software>
 
 	<software name="nobuseng1" cloneof="nobuamb2">
-		<description>Nobunaga no Yabou - Sengoku Gunyuuden (Jpn)</description>
+		<description>Nobunaga no Yabou - Sengoku Gunyuuden (Japan)</description>
 		<year>1990</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-NU"/>
@@ -27436,7 +27440,7 @@ license:CC0
 	</software>
 
 	<software name="nobuzenka" cloneof="nobuamb">
-		<description>Nobunaga no Yabou - Zenkokuban (Jpn)</description>
+		<description>Nobunaga no Yabou - Zenkokuban (Japan)</description>
 		<year>1988</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-NZ"/>
@@ -27561,7 +27565,7 @@ license:CC0
 	</software>
 
 	<software name="northnsj" cloneof="northns">
-		<description>North &amp; South - Wakuwaku Nanboku Sensou (Jpn)</description>
+		<description>North &amp; South - Wakuwaku Nanboku Sensou (Japan)</description>
 		<year>1990</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-N5"/>
@@ -27584,7 +27588,7 @@ license:CC0
 	</software>
 
 	<software name="nutsmilk">
-		<description>Nuts &amp; Milk (Jpn)</description>
+		<description>Nuts &amp; Milk (Japan)</description>
 		<year>1984</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-NM"/>
@@ -27605,7 +27609,7 @@ license:CC0
 	</software>
 
 	<software name="obakeqt" cloneof="ccherub">
-		<description>Obake no Q Tarou - Wanwan Panic (Jpn)</description>
+		<description>Obake no Q Tarou - Wanwan Panic (Japan)</description>
 		<year>1985</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-OBQ"/>
@@ -27625,7 +27629,7 @@ license:CC0
 	</software>
 
 	<software name="oboccha">
-		<description>Obocchama-kun (Jpn)</description>
+		<description>Obocchama-kun (Japan)</description>
 		<year>1991</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-3Q"/>
@@ -27649,7 +27653,7 @@ license:CC0
 	</software>
 
 	<software name="tonjan">
-		<description>Tonjan!? (Jpn)</description>
+		<description>Tonjan!? (Japan)</description>
 		<year>1989</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="NMK-JT"/>
@@ -27687,7 +27691,7 @@ license:CC0
 	</software>
 
 	<software name="oekashi" supported="no">
-		<description>Oeka Kids - Anpanman to Oekaki Shiyou!! (Jpn)</description>
+		<description>Oeka Kids - Anpanman to Oekaki Shiyou!! (Japan)</description>
 		<year>1990</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-OEKA1"/>
@@ -27707,7 +27711,7 @@ license:CC0
 	</software>
 
 	<software name="oishinbo">
-		<description>Oishinbo (Jpn)</description>
+		<description>Oishinbo (Japan)</description>
 		<year>1989</year>
 		<publisher>Shinsei</publisher>
 		<info name="serial" value="SHI-OS"/>
@@ -27727,7 +27731,7 @@ license:CC0
 	</software>
 
 	<software name="onyanko">
-		<description>Onyanko Town (Jpn)</description>
+		<description>Onyanko Town (Japan)</description>
 		<year>1985</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-OT (R49V5901)"/>
@@ -27844,7 +27848,7 @@ license:CC0
 	</software>
 
 	<software name="osomatsu">
-		<description>Osomatsu-kun (Jpn)</description>
+		<description>Osomatsu-kun (Japan)</description>
 		<year>1989</year>
 		<publisher>Shinsei</publisher>
 		<info name="serial" value="SHI-OB"/>
@@ -27864,7 +27868,7 @@ license:CC0
 	</software>
 
 	<software name="otaku">
-		<description>Otaku no Seiza - An Adventure in the Otaku Galaxy (Jpn)</description>
+		<description>Otaku no Seiza - An Adventure in the Otaku Galaxy (Japan)</description>
 		<year>1991</year>
 		<publisher>M&amp;M</publisher>
 		<info name="serial" value="MAM-OQ"/>
@@ -27888,7 +27892,7 @@ license:CC0
 	</software>
 
 	<software name="othelloj" cloneof="othello">
-		<description>Othello (Jpn)</description>
+		<description>Othello (Japan)</description>
 		<year>1986</year>
 		<publisher>Kawada</publisher>
 		<info name="serial" value="KWD-OH"/>
@@ -28030,7 +28034,7 @@ license:CC0
 	</software>
 
 	<software name="paaman2">
-		<description>Paaman Part 2 - Himitsu Kessha Madoodan o Taose! (Jpn)</description>
+		<description>Paaman Part 2 - Himitsu Kessha Madoodan o Taose! (Japan)</description>
 		<year>1991</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-25"/>
@@ -28050,7 +28054,7 @@ license:CC0
 	</software>
 
 	<software name="paaman">
-		<description>Paaman - Enban o Torikaese!! (Jpn)</description>
+		<description>Paaman - Enban o Torikaese!! (Japan)</description>
 		<year>1990</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-20"/>
@@ -28070,7 +28074,7 @@ license:CC0
 	</software>
 
 	<software name="pacland">
-		<description>Pac-Land (Jpn)</description>
+		<description>Pac-Land (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NPL-4500 (10)"/>
@@ -28229,7 +28233,7 @@ license:CC0
 	</software>
 
 	<software name="pachicom">
-		<description>Pachi Com (Jpn)</description>
+		<description>Pachi Com (Japan)</description>
 		<year>1985</year>
 		<publisher>Toemiland</publisher>
 		<info name="serial" value="TFS-PC (FS-2001G)"/>
@@ -28249,7 +28253,7 @@ license:CC0
 	</software>
 
 	<software name="pachisl2">
-		<description>Pachi Slot Adventure 2 - Sorotta Kun no Pachi Slot Tanteidan (Jpn)</description>
+		<description>Pachi Slot Adventure 2 - Sorotta Kun no Pachi Slot Tanteidan (Japan)</description>
 		<year>1993</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-PG"/>
@@ -28269,7 +28273,7 @@ license:CC0
 	</software>
 
 	<software name="pachisl3">
-		<description>Pachi Slot Adventure 3 - Bitaoshii 7 Kenzan! (Jpn)</description>
+		<description>Pachi Slot Adventure 3 - Bitaoshii 7 Kenzan! (Japan)</description>
 		<year>1994</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="HVC-PI"/>
@@ -28289,7 +28293,7 @@ license:CC0
 	</software>
 
 	<software name="pachidai">
-		<description>Pachinko Daisakusen 1 (Jpn)</description>
+		<description>Pachinko Daisakusen 1 (Japan)</description>
 		<year>1991</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-81"/>
@@ -28310,7 +28314,7 @@ license:CC0
 	</software>
 
 	<software name="pachida2">
-		<description>Pachinko Daisakusen 2 (Jpn)</description>
+		<description>Pachinko Daisakusen 2 (Japan)</description>
 		<year>1992</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-82"/>
@@ -28331,7 +28335,7 @@ license:CC0
 	</software>
 
 	<software name="pachikn2">
-		<description>Pachio-kun 2 (Jpn)</description>
+		<description>Pachio-kun 2 (Japan)</description>
 		<year>1989</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-P2"/>
@@ -28351,7 +28355,7 @@ license:CC0
 	</software>
 
 	<software name="pachikn3a" cloneof="pachikn3">
-		<description>Pachio-kun 3 (Jpn)</description>
+		<description>Pachio-kun 3 (Japan)</description>
 		<year>1990</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-P3"/>
@@ -28375,7 +28379,7 @@ license:CC0
 	</software>
 
 	<software name="pachikn4">
-		<description>Pachio-kun 4 (Jpn)</description>
+		<description>Pachio-kun 4 (Japan)</description>
 		<year>1991</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-84"/>
@@ -28400,7 +28404,7 @@ license:CC0
 	</software>
 
 	<software name="pachikn5">
-		<description>Pachio-kun Jr. (Jpn)</description>
+		<description>Pachio-kun Jr. (Japan)</description>
 		<year>1993</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-PE"/>
@@ -28425,7 +28429,7 @@ license:CC0
 	</software>
 
 	<software name="palamedsj" cloneof="palameds">
-		<description>Palamedes (Jpn)</description>
+		<description>Palamedes (Japan)</description>
 		<year>1990</year>
 		<publisher>Hot-B</publisher>
 		<info name="serial" value="GAM-JI (07)"/>
@@ -28464,7 +28468,7 @@ license:CC0
 	</software>
 
 	<software name="palamed2">
-		<description>Palamedes 2 - Star Twinkles (Jpn)</description>
+		<description>Palamedes 2 - Star Twinkles (Japan)</description>
 		<year>1991</year>
 		<publisher>Hot-B</publisher>
 		<info name="serial" value="GAM-Z5 (08)"/>
@@ -28522,7 +28526,7 @@ license:CC0
 	</software>
 
 	<software name="paperboyj" cloneof="paperboy">
-		<description>Paperboy (Jpn)</description>
+		<description>Paperboy (Japan)</description>
 		<year>1991</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="ALT-7B"/>
@@ -28721,7 +28725,7 @@ license:CC0
 	</software>
 
 	<software name="peepart">
-		<description>Peepar Time (Jpn)</description>
+		<description>Peepar Time (Japan)</description>
 		<year>1990</year>
 		<publisher>Sanritsu Denki</publisher>
 		<info name="serial" value="SAN-P6"/>
@@ -28741,7 +28745,7 @@ license:CC0
 	</software>
 
 	<software name="penguinw">
-		<description>Penguin-kun Wars (Jpn)</description>
+		<description>Penguin-kun Wars (Japan)</description>
 		<year>1985</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-03"/>
@@ -28761,7 +28765,7 @@ license:CC0
 	</software>
 
 	<software name="perfbowl" cloneof="bowling">
-		<description>Perfect Bowling (Jpn)</description>
+		<description>Perfect Bowling (Japan)</description>
 		<year>1989</year>
 		<publisher>Tonkin House</publisher>
 		<info name="serial" value="TKS-G8"/>
@@ -28781,7 +28785,7 @@ license:CC0
 	</software>
 
 	<software name="pescator">
-		<description>Pescatore (Jpn, prototype)</description>
+		<description>Pescatore (Japan, prototype)</description>
 		<year>1991</year>
 		<publisher>Sunsoft</publisher>
 		<part name="cart" interface="nes_cart">
@@ -29088,7 +29092,7 @@ license:CC0
 	</software>
 
 	<software name="pizzapop">
-		<description>Pizza Pop! (Jpn)</description>
+		<description>Pizza Pop! (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-35"/>
@@ -29107,7 +29111,7 @@ license:CC0
 	</software>
 
 	<software name="plasmab">
-		<description>Plasma Ball (Jpn)</description>
+		<description>Plasma Ball (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-36"/>
@@ -29206,7 +29210,7 @@ license:CC0
 	</software>
 
 	<software name="poolradj" cloneof="poolrad">
-		<description>Advanced Dungeons &amp; Dragons - Pool of Radiance (Jpn)</description>
+		<description>Advanced Dungeons &amp; Dragons - Pool of Radiance (Japan)</description>
 		<year>1991</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-QA (R98V5938)"/>
@@ -29230,7 +29234,7 @@ license:CC0
 	</software>
 
 	<software name="pooyan">
-		<description>Pooyan (Jpn)</description>
+		<description>Pooyan (Japan)</description>
 		<year>1985</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-PO"/>
@@ -29251,7 +29255,7 @@ license:CC0
 	</software>
 
 	<software name="popeye1" cloneof="popeye">
-		<description>Popeye (Jpn)</description>
+		<description>Popeye (Japan)</description>
 		<year>1983</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-PP"/>
@@ -29312,8 +29316,9 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="portopia">
-		<description>Portopia Renzoku Satsujin Jiken (Jpn)</description>
+<!-- Game has no sound and freezes when you dial a phone number -->
+	<software name="portopia" supported="no">
+		<description>Portopia Renzoku Satsujin Jiken (Japan)</description>
 		<year>1985</year>
 		<publisher>Enix</publisher>
 		<info name="serial" value="EFC-PR"/>
@@ -29390,7 +29395,7 @@ license:CC0
 	</software>
 
 	<software name="powblazr">
-		<description>Power Blazer (Jpn)</description>
+		<description>Power Blazer (Japan)</description>
 		<year>1990</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-PB-5900 (31)"/>
@@ -29428,7 +29433,7 @@ license:CC0
 	</software>
 
 	<software name="powsoccr">
-		<description>Power Soccer (Jpn)</description>
+		<description>Power Soccer (Japan)</description>
 		<year>1990</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="GTS-FT"/>
@@ -29448,7 +29453,7 @@ license:CC0
 	</software>
 
 	<software name="predatorj" cloneof="predator">
-		<description>Predator (Jpn)</description>
+		<description>Predator (Japan)</description>
 		<year>1988</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="PAC-PL"/>
@@ -29487,7 +29492,7 @@ license:CC0
 	</software>
 
 	<software name="presidnt">
-		<description>President no Sentaku (Jpn)</description>
+		<description>President no Sentaku (Japan)</description>
 		<year>1990</year>
 		<publisher>Hot-B</publisher>
 		<info name="serial" value="GAM-B3 (06)"/>
@@ -29700,7 +29705,7 @@ license:CC0
 	</software>
 
 	<software name="famista" cloneof="rbibb">
-		<description>Pro Yakyuu Family Stadium (Jpn)</description>
+		<description>Pro Yakyuu Family Stadium (Japan)</description>
 		<year>1986</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FS-3900"/>
@@ -29720,7 +29725,7 @@ license:CC0
 	</software>
 
 	<software name="famist87">
-		<description>Pro Yakyuu Family Stadium '87 (Jpn)</description>
+		<description>Pro Yakyuu Family Stadium '87 (Japan)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FS87-3900"/>
@@ -29740,7 +29745,7 @@ license:CC0
 	</software>
 
 	<software name="famist88">
-		<description>Pro Yakyuu Family Stadium '88 (Jpn)</description>
+		<description>Pro Yakyuu Family Stadium '88 (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FS88-4900"/>
@@ -29760,7 +29765,7 @@ license:CC0
 	</software>
 
 	<software name="proyaksj">
-		<description>Pro Yakyuu Satsujin Jiken! (Jpn)</description>
+		<description>Pro Yakyuu Satsujin Jiken! (Japan)</description>
 		<year>1988</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-PV"/>
@@ -29894,7 +29899,7 @@ license:CC0
 	</software>
 
 	<software name="puzslot">
-		<description>Puzslot (Jpn)</description>
+		<description>Puzslot (Japan)</description>
 		<year>1992</year>
 		<publisher>Sammy</publisher>
 		<info name="serial" value="SAC-1P"/>
@@ -29987,7 +29992,7 @@ license:CC0
 	</software>
 
 	<software name="pyokotan">
-		<description>Pyokotan no Dai Meiro (Jpn)</description>
+		<description>Pyokotan no Dai Meiro (Japan)</description>
 		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-PYK-4980"/>
@@ -30086,7 +30091,7 @@ license:CC0
 	</software>
 
 	<software name="quarth">
-		<description>Quarth (Jpn)</description>
+		<description>Quarth (Japan)</description>
 		<year>1990</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-H7"/>
@@ -30162,7 +30167,7 @@ license:CC0
 	</software>
 
 	<software name="quinty" cloneof="mendel" supported="no">
-		<description>Quinty (Jpn)</description>
+		<description>Quinty (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-QT-4900"/>
@@ -30416,7 +30421,7 @@ license:CC0
 	</software>
 
 	<software name="racrmini">
-		<description>Racer Mini Yonku - Japan Cup (Jpn)</description>
+		<description>Racer Mini Yonku - Japan Cup (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC842"/>
@@ -30636,7 +30641,7 @@ license:CC0
 	</software>
 
 	<software name="radiaj" cloneof="radia">
-		<description>Radia Senki - Reimei Hen (Jpn)</description>
+		<description>Radia Senki - Reimei Hen (Japan)</description>
 		<year>1991</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-8R"/>
@@ -30740,7 +30745,7 @@ license:CC0
 	</software>
 
 	<software name="rbislantj" cloneof="rbislant">
-		<description>Rainbow Islands - The Story of Bubble Bobble 2 (Jpn)</description>
+		<description>Rainbow Islands - The Story of Bubble Bobble 2 (Japan)</description>
 		<year>1988</year>
 		<publisher>Taito / Disco</publisher>
 		<info name="serial" value="DTF-RL (19)"/>
@@ -30816,7 +30821,7 @@ license:CC0
 	</software>
 
 	<software name="ramboj" cloneof="rambo">
-		<description>Rambo (Jpn)</description>
+		<description>Rambo (Japan)</description>
 		<year>1987</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="PAC-RV"/>
@@ -30911,7 +30916,7 @@ license:CC0
 	</software>
 
 	<software name="rampartj">
-		<description>Rampart (Jpn)</description>
+		<description>Rampart (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-73"/>
@@ -30950,7 +30955,7 @@ license:CC0
 	</software>
 
 	<software name="childqst">
-		<description>Lasalle Ishii no Childs Quest (Jpn)</description>
+		<description>Lasalle Ishii no Childs Quest (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-CQ-5500"/>
@@ -30970,7 +30975,7 @@ license:CC0
 	</software>
 
 	<software name="reigendo" cloneof="phantomf">
-		<description>Reigen Doushi (Jpn)</description>
+		<description>Reigen Doushi (Japan)</description>
 		<year>1988</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-KY (R59V5917)"/>
@@ -31102,7 +31107,7 @@ license:CC0
 	</software>
 
 	<software name="ripple">
-		<description>Ripple Island (Jpn)</description>
+		<description>Ripple Island (Japan)</description>
 		<year>1988</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="TEC-RI"/>
@@ -31141,7 +31146,7 @@ license:CC0
 	</software>
 
 	<software name="roadfghtj" cloneof="roadfght">
-		<description>Road Fighter (Jpn)</description>
+		<description>Road Fighter (Japan)</description>
 		<year>1985</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC801"/>
@@ -31370,7 +31375,7 @@ license:CC0
 	</software>
 
 	<software name="roboccow">
-		<description>Robocco Wars (Jpn)</description>
+		<description>Robocco Wars (Japan)</description>
 		<year>1991</year>
 		<publisher>IGS</publisher>
 		<info name="serial" value="IGS-X9"/>
@@ -31428,7 +31433,7 @@ license:CC0
 	</software>
 
 	<software name="robocop2j" cloneof="robocop2">
-		<description>RoboCop 2 (Jpn)</description>
+		<description>RoboCop 2 (Japan)</description>
 		<year>1991</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-2C"/>
@@ -31657,7 +31662,7 @@ license:CC0
 	</software>
 
 	<software name="rockman" cloneof="megaman">
-		<description>Rockman (Jpn)</description>
+		<description>Rockman (Japan)</description>
 		<year>1987</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-RX"/>
@@ -31677,7 +31682,7 @@ license:CC0
 	</software>
 
 	<software name="rockman2" cloneof="megaman2">
-		<description>Rockman 2 - Dr. Wily no Nazo (Jpn)</description>
+		<description>Rockman 2 - Dr. Wily no Nazo (Japan)</description>
 		<year>1988</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-XR"/>
@@ -31697,7 +31702,7 @@ license:CC0
 	</software>
 
 	<software name="rockman3" cloneof="megaman3">
-		<description>Rockman 3 - Dr. Wily no Saigo!? (Jpn)</description>
+		<description>Rockman 3 - Dr. Wily no Saigo!? (Japan)</description>
 		<year>1990</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-XU"/>
@@ -31717,7 +31722,7 @@ license:CC0
 	</software>
 
 	<software name="rockman4a" cloneof="megaman4">
-		<description>Rockman 4 - Aratanaru Yabou!! (Jpn)</description>
+		<description>Rockman 4 - Aratanaru Yabou!! (Japan)</description>
 		<year>1991</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-4V"/>
@@ -31737,7 +31742,7 @@ license:CC0
 	</software>
 
 	<software name="rockman5" cloneof="megaman5">
-		<description>Rockman 5 - Blues no Wana!? (Jpn)</description>
+		<description>Rockman 5 - Blues no Wana!? (Japan)</description>
 		<year>1992</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-5V"/>
@@ -31757,7 +31762,7 @@ license:CC0
 	</software>
 
 	<software name="rockman6" cloneof="megaman6">
-		<description>Rockman 6 - Shijou Saidai no Tatakai!! (Jpn)</description>
+		<description>Rockman 6 - Shijou Saidai no Tatakai!! (Japan)</description>
 		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-6V"/>
@@ -31831,7 +31836,7 @@ license:CC0
 	</software>
 
 	<software name="rokudena">
-		<description>Rokudenashi Blues (Jpn)</description>
+		<description>Rokudenashi Blues (Japan)</description>
 		<year>1993</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-ROKU"/>
@@ -31964,7 +31969,7 @@ license:CC0
 	</software>
 
 	<software name="rthunderj" cloneof="rthunder">
-		<description>Rolling Thunder (Jpn)</description>
+		<description>Rolling Thunder (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-RT-5500"/>
@@ -32120,7 +32125,7 @@ license:CC0
 	</software>
 
 	<software name="route16">
-		<description>Route-16 Turbo (Jpn)</description>
+		<description>Route-16 Turbo (Japan)</description>
 		<year>1985</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-R16-4900 (SS2)"/>
@@ -32140,7 +32145,7 @@ license:CC0
 	</software>
 
 	<software name="royalbld" cloneof="gemfire">
-		<description>Royal Blood (Jpn)</description>
+		<description>Royal Blood (Japan)</description>
 		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-IU"/>
@@ -32301,7 +32306,7 @@ license:CC0
 	</software>
 
 	<software name="sdgndgs2">
-		<description>SD Gundam Gachapon Senshi 2 - Capsule Senki (Jpn)</description>
+		<description>SD Gundam Gachapon Senshi 2 - Capsule Senki (Japan)</description>
 		<year>1989</year>
 		<publisher>Shinsei</publisher>
 		<info name="serial" value="SHI-2G"/>
@@ -32325,7 +32330,7 @@ license:CC0
 	</software>
 
 	<software name="sdgndgs3">
-		<description>SD Gundam Gachapon Senshi 3 - Eiyuu Senki (Jpn)</description>
+		<description>SD Gundam Gachapon Senshi 3 - Eiyuu Senki (Japan)</description>
 		<year>1990</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHI-3G"/>
@@ -32349,7 +32354,7 @@ license:CC0
 	</software>
 
 	<software name="sdgndgs4">
-		<description>SD Gundam Gachapon Senshi 4 - New Type Story (Jpn)</description>
+		<description>SD Gundam Gachapon Senshi 4 - New Type Story (Japan)</description>
 		<year>1991</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHI-45"/>
@@ -32373,7 +32378,7 @@ license:CC0
 	</software>
 
 	<software name="sdgndgs5">
-		<description>SD Gundam Gachapon Senshi 5 - Battle of Universal Century (Jpn)</description>
+		<description>SD Gundam Gachapon Senshi 5 - Battle of Universal Century (Japan)</description>
 		<year>1992</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHI-P5"/>
@@ -32397,7 +32402,7 @@ license:CC0
 	</software>
 
 	<software name="kgundama" cloneof="kgundam">
-		<description>SD Gundam Gaiden - Knight Gundam Monogatari (Jpn)</description>
+		<description>SD Gundam Gaiden - Knight Gundam Monogatari (Japan)</description>
 		<year>1990</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-KGD"/>
@@ -32416,7 +32421,7 @@ license:CC0
 	</software>
 
 	<software name="kgundam">
-		<description>SD Gundam Gaiden - Knight Gundam Monogatari (Jpn, v2.0)</description>
+		<description>SD Gundam Gaiden - Knight Gundam Monogatari (Japan, v2.0)</description>
 		<year>1990</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-KGD"/>
@@ -32435,7 +32440,7 @@ license:CC0
 	</software>
 
 	<software name="kgundam2">
-		<description>SD Gundam Gaiden - Knight Gundam Monogatari 2 - Hikari no Kishi (Jpn)</description>
+		<description>SD Gundam Gaiden - Knight Gundam Monogatari 2 - Hikari no Kishi (Japan)</description>
 		<year>1991</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-KGD2"/>
@@ -32454,7 +32459,7 @@ license:CC0
 	</software>
 
 	<software name="kgundam3">
-		<description>SD Gundam Gaiden - Knight Gundam Monogatari 3 - Densetsu no Kishi Dan (Jpn)</description>
+		<description>SD Gundam Gaiden - Knight Gundam Monogatari 3 - Densetsu no Kishi Dan (Japan)</description>
 		<year>1992</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-KGD3"/>
@@ -32473,7 +32478,7 @@ license:CC0
 	</software>
 
 	<software name="sdhero">
-		<description>SD Hero Soukessen - Taose! Aku no Gundan (Jpn)</description>
+		<description>SD Hero Soukessen - Taose! Aku no Gundan (Japan)</description>
 		<year>1990</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="BAP-X5"/>
@@ -32516,7 +32521,7 @@ license:CC0
 	</software>
 
 	<software name="sdsengo">
-		<description>SD Sengoku Bushou Retsuden (Jpn)</description>
+		<description>SD Sengoku Bushou Retsuden (Japan)</description>
 		<year>1990</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="BAP-X6"/>
@@ -32540,7 +32545,7 @@ license:CC0
 	</software>
 
 	<software name="swat">
-		<description>SWAT - Special Weapons and Tactics (Jpn)</description>
+		<description>SWAT - Special Weapons and Tactics (Japan)</description>
 		<year>1987</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-SW"/>
@@ -32559,7 +32564,7 @@ license:CC0
 	</software>
 
 	<software name="sseiya">
-		<description>Saint Seiya - Ougon Densetsu (Jpn)</description>
+		<description>Saint Seiya - Ougon Densetsu (Japan)</description>
 		<year>1987</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-SEIYA"/>
@@ -32579,7 +32584,7 @@ license:CC0
 	</software>
 
 	<software name="sseiya2">
-		<description>Saint Seiya - Ougon Densetsu Kanketsu Hen (Jpn)</description>
+		<description>Saint Seiya - Ougon Densetsu Kanketsu Hen (Japan)</description>
 		<year>1988</year>
 		<publisher>Shinsei</publisher>
 		<info name="serial" value="SHI-OK"/>
@@ -32599,7 +32604,7 @@ license:CC0
 	</software>
 
 	<software name="saiyukiw">
-		<description>Saiyuuki World (Jpn)</description>
+		<description>Saiyuuki World (Japan)</description>
 		<year>1988</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="NMK-KW"/>
@@ -32619,7 +32624,7 @@ license:CC0
 	</software>
 
 	<software name="saiyuki2" cloneof="whompem">
-		<description>Saiyuuki World 2 - Tenjoukai no Majin (Jpn)</description>
+		<description>Saiyuuki World 2 - Tenjoukai no Majin (Japan)</description>
 		<year>1990</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-31"/>
@@ -32638,7 +32643,7 @@ license:CC0
 	</software>
 
 	<software name="sakigake">
-		<description>Sakigake!! Otoko Juku - Shippu Ichi Gou Sei (Jpn)</description>
+		<description>Sakigake!! Otoko Juku - Shippu Ichi Gou Sei (Japan)</description>
 		<year>1989</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BA-SAKI"/>
@@ -32657,7 +32662,7 @@ license:CC0
 	</software>
 
 	<software name="tomathim" cloneof="printomt">
-		<description>Salad no Kuni no Tomato Hime (Jpn)</description>
+		<description>Salad no Kuni no Tomato Hime (Japan)</description>
 		<year>1988</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-RT"/>
@@ -32677,7 +32682,7 @@ license:CC0
 	</software>
 
 	<software name="salamandj" cloneof="salamand">
-		<description>Salamander (Jpn)</description>
+		<description>Salamander (Japan)</description>
 		<year>1987</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC821"/>
@@ -32700,7 +32705,7 @@ license:CC0
 	</software>
 
 	<software name="samsaran">
-		<description>Samsara Naga (Jpn)</description>
+		<description>Samsara Naga (Japan)</description>
 		<year>1990</year>
 		<publisher>Victor Ongaku Sangyou</publisher>
 		<info name="serial" value="VFR-Q1 (08)"/>
@@ -32724,7 +32729,7 @@ license:CC0
 	</software>
 
 	<software name="sanada">
-		<description>Sanada Juu Yuushi (Jpn)</description>
+		<description>Sanada Juu Yuushi (Japan)</description>
 		<year>1988</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-JY"/>
@@ -33076,7 +33081,7 @@ license:CC0
 	</software>
 
 	<software name="satsui">
-		<description>Satsui no Kaisou - Power Soft Satsujin Jiken (Jpn)</description>
+		<description>Satsui no Kaisou - Power Soft Satsujin Jiken (Japan)</description>
 		<year>1988</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-PB"/>
@@ -33100,7 +33105,7 @@ license:CC0
 	</software>
 
 	<software name="satsujin">
-		<description>Murder Club - Satsujin Club (Jpn)</description>
+		<description>Murder Club - Satsujin Club (Japan)</description>
 		<year>1989</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="KKS-RZ (05)"/>
@@ -33212,7 +33217,7 @@ license:CC0
 	</software>
 
 	<software name="seicrossja" cloneof="seicross">
-		<description>Seicross (Jpn)</description>
+		<description>Seicross (Japan)</description>
 		<year>1986</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-SE (02)"/>
@@ -33232,7 +33237,7 @@ license:CC0
 	</software>
 
 	<software name="seicrossj" cloneof="seicross">
-		<description>Seicross (Jpn, v2.0)</description>
+		<description>Seicross (Japan, v2.0)</description>
 		<year>1986</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-SE (02)"/>
@@ -33273,7 +33278,7 @@ license:CC0
 	</software>
 
 	<software name="seikima2">
-		<description>Seikima II - Akuma no Gyakushuu (Jpn)</description>
+		<description>Seikima II - Akuma no Gyakushuu (Japan)</description>
 		<year>1986</year>
 		<publisher>CBS / Sony Group</publisher>
 		<info name="serial" value="CBS-SA"/>
@@ -33293,7 +33298,7 @@ license:CC0
 	</software>
 
 	<software name="sdlickle" cloneof="lilsamsn">
-		<description>Seirei Densetsu Lickle (Jpn)</description>
+		<description>Seirei Densetsu Lickle (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito / Disco</publisher>
 		<info name="serial" value="DTF-LK (44)"/>
@@ -33313,7 +33318,7 @@ license:CC0
 	</software>
 
 	<software name="seireiga">
-		<description>Seirei Gari (Jpn)</description>
+		<description>Seirei Gari (Japan)</description>
 		<year>1989</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-V1"/>
@@ -33333,7 +33338,7 @@ license:CC0
 	</software>
 
 	<software name="shancara">
-		<description>Seiryaku Simulation - Inbou no Wakusei - Shancara (Jpn)</description>
+		<description>Seiryaku Simulation - Inbou no Wakusei - Shancara (Japan)</description>
 		<year>1992</year>
 		<publisher>IGS</publisher>
 		<info name="serial" value="IGS-SV"/>
@@ -33357,7 +33362,7 @@ license:CC0
 	</software>
 
 	<software name="sekiryu">
-		<description>Sekiryuuou (Jpn)</description>
+		<description>Sekiryuuou (Japan)</description>
 		<year>1989</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="TEC-AJ"/>
@@ -33377,7 +33382,7 @@ license:CC0
 	</software>
 
 	<software name="senjokam" cloneof="commando">
-		<description>Senjou no Ookami (Jpn)</description>
+		<description>Senjou no Ookami (Japan)</description>
 		<year>1986</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-SJ"/>
@@ -33397,7 +33402,7 @@ license:CC0
 	</software>
 
 	<software name="senshasn" cloneof="desertcm">
-		<description>Sensha Senryaku - Sabaku no Kitsune (Jpn)</description>
+		<description>Sensha Senryaku - Sabaku no Kitsune (Japan)</description>
 		<year>1988</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-DF"/>
@@ -33571,7 +33576,7 @@ license:CC0
 	</software>
 
 	<software name="shadgatej" cloneof="shadgate">
-		<description>Shadowgate (Jpn)</description>
+		<description>Shadowgate (Japan)</description>
 		<year>1989</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-3S"/>
@@ -33808,7 +33813,7 @@ license:CC0
 	</software>
 
 	<software name="shikinjo">
-		<description>Shikinjou (Jpn)</description>
+		<description>Shikinjou (Japan)</description>
 		<year>1991</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-96"/>
@@ -33828,7 +33833,7 @@ license:CC0
 	</software>
 
 	<software name="shin4num" supported="no">
-		<description>Shin 4-nin Uchi Mahjong - Yakuman Tengoku (Jpn)</description>
+		<description>Shin 4-nin Uchi Mahjong - Yakuman Tengoku (Japan)</description>
 		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-YT"/>
@@ -33854,7 +33859,7 @@ license:CC0
 	</software>
 
 	<software name="sjinrui" cloneof="dinoriki">
-		<description>Shin Jinrui - The New Type (Jpn)</description>
+		<description>Shin Jinrui - The New Type (Japan)</description>
 		<year>1987</year>
 		<publisher>Rix Soft</publisher>
 		<info name="serial" value="RES-SG"/>
@@ -33874,7 +33879,7 @@ license:CC0
 	</software>
 
 	<software name="smoeproy">
-		<description>Shin Moero!! Pro Yakyuu (Jpn)</description>
+		<description>Shin Moero!! Pro Yakyuu (Japan)</description>
 		<year>1989</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-23"/>
@@ -33896,7 +33901,7 @@ license:CC0
 	</software>
 
 	<software name="shinsato">
-		<description>Shin Satomi Hakkenden - Hikari to Yami no Tatakai (Jpn)</description>
+		<description>Shin Satomi Hakkenden - Hikari to Yami no Tatakai (Japan)</description>
 		<year>1989</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-91"/>
@@ -33960,7 +33965,7 @@ license:CC0
 	</software>
 
 	<software name="shinsend">
-		<description>Shinsenden (Jpn)</description>
+		<description>Shinsenden (Japan)</description>
 		<year>1989</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="TIX-Z3 (IF-16)"/>
@@ -34002,7 +34007,7 @@ license:CC0
 	</software>
 
 	<software name="shogun">
-		<description>Shogun (Jpn)</description>
+		<description>Shogun (Japan)</description>
 		<year>1988</year>
 		<publisher>Hect</publisher>
 		<info name="serial" value="HCT-HD/001"/>
@@ -34066,7 +34071,7 @@ license:CC0
 	</software>
 
 	<software name="shokoced">
-		<description>Shoukoushi Ceddie (Jpn)</description>
+		<description>Shoukoushi Ceddie (Japan)</description>
 		<year>1988</year>
 		<publisher>Fuji TV</publisher>
 		<info name="serial" value="FMI-CD"/>
@@ -34090,7 +34095,7 @@ license:CC0
 	</software>
 
 	<software name="shonashi">
-		<description>Shounen Ashibe - Nepal Daibouken no Maki (Jpn)</description>
+		<description>Shounen Ashibe - Nepal Daibouken no Maki (Japan)</description>
 		<year>1991</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="TFC-8A"/>
@@ -34114,7 +34119,7 @@ license:CC0
 	</software>
 
 	<software name="shufflef">
-		<description>Shuffle Fight (Jpn)</description>
+		<description>Shuffle Fight (Japan)</description>
 		<year>1992</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="BAP-CB"/>
@@ -34138,7 +34143,7 @@ license:CC0
 	</software>
 
 	<software name="shflpuck">
-		<description>Shufflepuck Cafe (Jpn)</description>
+		<description>Shufflepuck Cafe (Japan)</description>
 		<year>1990</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PHF-XP (R62V10002)"/>
@@ -34158,7 +34163,7 @@ license:CC0
 	</software>
 
 	<software name="sidepockj" cloneof="sidepock">
-		<description>Side Pocket (Jpn)</description>
+		<description>Side Pocket (Japan)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-SP-3900"/>
@@ -34312,7 +34317,7 @@ license:CC0
 <!-- dump confirmed by naruko -->
 <!-- the game misbehaves if SRAM is fully init to 0x00, due to buggy programming of the game -->
 	<software name="silvasag">
-		<description>Silva Saga (Jpn)</description>
+		<description>Silva Saga (Japan)</description>
 		<year>1992</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="KKS-SR (07)"/>
@@ -34639,7 +34644,7 @@ license:CC0
 	</software>
 
 	<software name="skydestr">
-		<description>Sky Destroyer (Jpn)</description>
+		<description>Sky Destroyer (Japan)</description>
 		<year>1985</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-SD-4500 (05)"/>
@@ -35049,7 +35054,7 @@ license:CC0
 	</software>
 
 	<software name="solomonj" cloneof="solomon">
-		<description>Solomon no Kagi (Jpn)</description>
+		<description>Solomon no Kagi (Japan)</description>
 		<year>1986</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-SK"/>
@@ -35107,7 +35112,7 @@ license:CC0
 	</software>
 
 	<software name="solomon2j" cloneof="solomon2">
-		<description>Solomon no Kagi 2 - Coolmin Tou Kyuushutsu Sakusen (Jpn)</description>
+		<description>Solomon no Kagi 2 - Coolmin Tou Kyuushutsu Sakusen (Japan)</description>
 		<year>1992</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-SZ"/>
@@ -35189,7 +35194,7 @@ license:CC0
 	</software>
 
 	<software name="solsticej" cloneof="solstice">
-		<description>Solstice (Jpn)</description>
+		<description>Solstice (Japan)</description>
 		<year>1990</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="ESF-E3 (ESPG-33)"/>
@@ -35208,7 +35213,7 @@ license:CC0
 	</software>
 
 	<software name="sonson">
-		<description>Son Son (Jpn)</description>
+		<description>Son Son (Japan)</description>
 		<year>1986</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-SS"/>
@@ -35228,7 +35233,7 @@ license:CC0
 	</software>
 
 	<software name="anpanman">
-		<description>Soreike! Anpanman - Minna de Hiking Game! (Jpn)</description>
+		<description>Soreike! Anpanman - Minna de Hiking Game! (Japan)</description>
 		<year>1992</year>
 		<publisher>Bandai</publisher>
 		<info name="serial" value="BAN-OZ"/>
@@ -35248,7 +35253,7 @@ license:CC0
 	</software>
 
 	<software name="sharrier">
-		<description>Space Harrier (Jpn)</description>
+		<description>Space Harrier (Japan)</description>
 		<year>1989</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="TFC-SO"/>
@@ -35268,7 +35273,7 @@ license:CC0
 	</software>
 
 	<software name="spacehnt">
-		<description>Space Hunter (Jpn)</description>
+		<description>Space Hunter (Japan)</description>
 		<year>1986</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-HT"/>
@@ -35288,7 +35293,7 @@ license:CC0
 	</software>
 
 	<software name="spaceinv">
-		<description>Space Invaders (Jpn)</description>
+		<description>Space Invaders (Japan)</description>
 		<year>1985</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-SI-4500 (01)"/>
@@ -35328,7 +35333,7 @@ license:CC0
 	</software>
 
 	<software name="spartanx" cloneof="kungfu">
-		<description>Spartan X (Jpn)</description>
+		<description>Spartan X (Japan)</description>
 		<year>1985</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-SX"/>
@@ -35348,7 +35353,7 @@ license:CC0
 	</software>
 
 	<software name="spartnx2">
-		<description>Spartan X 2 (Jpn)</description>
+		<description>Spartan X 2 (Japan)</description>
 		<year>1991</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-23"/>
@@ -35367,7 +35372,7 @@ license:CC0
 	</software>
 
 	<software name="spelunkrj" cloneof="spelunkr">
-		<description>Spelunker (Jpn)</description>
+		<description>Spelunker (Japan)</description>
 		<year>1985</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-03"/>
@@ -35406,7 +35411,7 @@ license:CC0
 	</software>
 
 	<software name="spelunk2">
-		<description>Spelunker II - Yuusha e no Chousen (Jpn)</description>
+		<description>Spelunker II - Yuusha e no Chousen (Japan)</description>
 		<year>1987</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-06"/>
@@ -35517,7 +35522,7 @@ license:CC0
 	</software>
 
 	<software name="splatth">
-		<description>Splatterhouse - Wanpaku Graffiti (Jpn)</description>
+		<description>Splatterhouse - Wanpaku Graffiti (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FSH-4900"/>
@@ -35585,7 +35590,7 @@ license:CC0
 	</software>
 
 	<software name="spyvsspyj" cloneof="spyvsspy">
-		<description>Spy vs. Spy (Jpn)</description>
+		<description>Spy vs. Spy (Japan)</description>
 		<year>1986</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-SP"/>
@@ -35645,7 +35650,7 @@ license:CC0
 	</software>
 
 	<software name="sqoonja" cloneof="sqoon">
-		<description>Sqoon (Jpn)</description>
+		<description>Sqoon (Japan)</description>
 		<year>1986</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-04"/>
@@ -35684,7 +35689,7 @@ license:CC0
 	</software>
 
 	<software name="sqtomsaw">
-		<description>Square no Tom Sawyer (Jpn)</description>
+		<description>Square no Tom Sawyer (Japan)</description>
 		<year>1989</year>
 		<publisher>Square</publisher>
 		<info name="serial" value="SQF-T4"/>
@@ -35886,7 +35891,7 @@ license:CC0
 	</software>
 
 	<software name="stargate" cloneof="defendr2">
-		<description>Star Gate (Jpn)</description>
+		<description>Star Gate (Japan)</description>
 		<year>1987</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-SB"/>
@@ -35907,7 +35912,7 @@ license:CC0
 	</software>
 
 	<software name="starlust">
-		<description>Star Luster (Jpn)</description>
+		<description>Star Luster (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NSL-4900 (12)"/>
@@ -35927,7 +35932,7 @@ license:CC0
 	</software>
 
 	<software name="starsoldj" cloneof="starsold">
-		<description>Star Soldier (Jpn)</description>
+		<description>Star Soldier (Japan)</description>
 		<year>1986</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-SO"/>
@@ -36023,7 +36028,7 @@ license:CC0
 	</software>
 
 	<software name="starwrsn">
-		<description>Star Wars (Jpn, Namco)</description>
+		<description>Star Wars (Japan, Namco)</description>
 		<year>1987</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-SS-4900"/>
@@ -36255,7 +36260,7 @@ license:CC0
 	</software>
 
 	<software name="sted">
-		<description>STED - Iseki Wakusei no Yabou (Jpn)</description>
+		<description>STED - Iseki Wakusei no Yabou (Japan)</description>
 		<year>1990</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="KAC-3E"/>
@@ -36279,7 +36284,7 @@ license:CC0
 	</software>
 
 	<software name="stickhnt">
-		<description>Stick Hunter - Exciting Ice Hockey Game (Jpn)</description>
+		<description>Stick Hunter - Exciting Ice Hockey Game (Japan)</description>
 		<year>1987</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="KAC-IH"/>
@@ -36413,7 +36418,7 @@ license:CC0
 	</software>
 
 	<software name="sugoro">
-		<description>Sugoro Quest - Dice no Senshi-tachi (Jpn)</description>
+		<description>Sugoro Quest - Dice no Senshi-tachi (Japan)</description>
 		<year>1991</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-Q7"/>
@@ -36437,7 +36442,7 @@ license:CC0
 	</software>
 
 	<software name="suikoden" cloneof="bandking">
-		<description>Suikoden - Tenmei no Chikai (Jpn)</description>
+		<description>Suikoden - Tenmei no Chikai (Japan)</description>
 		<year>1990</year>
 		<publisher>Koei</publisher>
 		<info name="serial" value="KOE-XJ"/>
@@ -36466,7 +36471,7 @@ license:CC0
 	</software>
 
 	<software name="sukeban3">
-		<description>Sukeban Deka III (Jpn)</description>
+		<description>Sukeban Deka III (Japan)</description>
 		<year>1988</year>
 		<publisher>Toei Animation</publisher>
 		<info name="serial" value="TDF-KJ"/>
@@ -36542,7 +36547,7 @@ license:CC0
 	</software>
 
 	<software name="suprarab">
-		<description>Super Arabian (Jpn)</description>
+		<description>Super Arabian (Japan)</description>
 		<year>1985</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SUN-SA-4500 (SS1)"/>
@@ -36563,7 +36568,7 @@ license:CC0
 	</software>
 
 	<software name="supbonyx">
-		<description>Super Black Onyx (Jpn)</description>
+		<description>Super Black Onyx (Japan)</description>
 		<year>1988</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="BPS-OX"/>
@@ -36625,7 +36630,7 @@ license:CC0
 	</software>
 
 	<software name="supchin" cloneof="kungfuh">
-		<description>Super Chinese (Jpn)</description>
+		<description>Super Chinese (Japan)</description>
 		<year>1986</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NSC-4900-15"/>
@@ -36645,7 +36650,7 @@ license:CC0
 	</software>
 
 	<software name="supchin2" cloneof="lilninjb">
-		<description>Super Chinese 2 - Dragon Kid (Jpn)</description>
+		<description>Super Chinese 2 - Dragon Kid (Japan)</description>
 		<year>1989</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="CBF-C2"/>
@@ -36665,7 +36670,7 @@ license:CC0
 	</software>
 
 	<software name="supchin3">
-		<description>Super Chinese 3 (Jpn)</description>
+		<description>Super Chinese 3 (Japan)</description>
 		<year>1991</year>
 		<publisher>Culture Brain</publisher>
 		<info name="serial" value="CBF-3C"/>
@@ -37156,7 +37161,7 @@ license:CC0
 	</software>
 
 	<software name="smomo">
-		<description>Super Momotarou Dentetsu (Jpn)</description>
+		<description>Super Momotarou Dentetsu (Japan)</description>
 		<year>1992</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HFC-3X"/>
@@ -37218,7 +37223,7 @@ license:CC0
 	</software>
 
 	<software name="spitfallj" cloneof="spitfall">
-		<description>Super Pitfall (Jpn)</description>
+		<description>Super Pitfall (Japan)</description>
 		<year>1986</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-PF (R55V5903)"/>
@@ -37257,7 +37262,7 @@ license:CC0
 	</software>
 
 	<software name="realbb88">
-		<description>Super Real Baseball '88 (Jpn)</description>
+		<description>Super Real Baseball '88 (Japan)</description>
 		<year>1988</year>
 		<publisher>Vap</publisher>
 		<info name="serial" value="VAP-BG"/>
@@ -37277,7 +37282,7 @@ license:CC0
 	</software>
 
 	<software name="srugby">
-		<description>Super Rugby (Jpn)</description>
+		<description>Super Rugby (Japan)</description>
 		<year>1989</year>
 		<publisher>TSS</publisher>
 		<info name="serial" value="TSS-S7"/>
@@ -37357,7 +37362,7 @@ license:CC0
 	</software>
 
 	<software name="ssprintj" cloneof="ssprint">
-		<description>Super Sprint (Jpn)</description>
+		<description>Super Sprint (Japan)</description>
 		<year>1991</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="ALT-7C"/>
@@ -37433,7 +37438,7 @@ license:CC0
 	</software>
 
 	<software name="sstarfrc">
-		<description>Super Star Force (Jpn)</description>
+		<description>Super Star Force (Japan)</description>
 		<year>1986</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-ST"/>
@@ -37495,7 +37500,7 @@ license:CC0
 	</software>
 
 	<software name="sxevious">
-		<description>Super Xevious - Gump no Nazo (Jpn)</description>
+		<description>Super Xevious - Gump no Nazo (Japan)</description>
 		<year>1986</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-SX-4900"/>
@@ -37515,7 +37520,7 @@ license:CC0
 	</software>
 
 	<software name="supermanj" cloneof="superman" supported="partial">
-		<description>Superman (Jpn)</description>
+		<description>Superman (Japan)</description>
 		<year>1987</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-SN"/>
@@ -37628,7 +37633,7 @@ license:CC0
 	</software>
 
 	<software name="sweethom">
-		<description>Sweet Home (Jpn)</description>
+		<description>Sweet Home (Japan)</description>
 		<year>1989</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-EH"/>
@@ -37823,7 +37828,7 @@ license:CC0
 	</software>
 
 	<software name="livepb">
-		<description>TM Network - Live in Power Bowl (Jpn)</description>
+		<description>TM Network - Live in Power Bowl (Japan)</description>
 		<year>1989</year>
 		<publisher>CBS / Sony Group</publisher>
 		<info name="serial" value="ESF-T9 (ESPG31)"/>
@@ -38229,7 +38234,7 @@ license:CC0
 	</software>
 
 	<software name="tamuramj">
-		<description>Tamura Koushou Mahjong Seminar (Jpn)</description>
+		<description>Tamura Koushou Mahjong Seminar (Japan)</description>
 		<year>1990</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-ZR (R58V5931)"/>
@@ -38253,7 +38258,7 @@ license:CC0
 	</software>
 
 	<software name="tkshogi2">
-		<description>Tanigawa Kouji no Shougi Shinan II (Jpn)</description>
+		<description>Tanigawa Kouji no Shougi Shinan II (Japan)</description>
 		<year>1988</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-T2 (R55V5914)"/>
@@ -38277,7 +38282,7 @@ license:CC0
 	</software>
 
 	<software name="tkshogi3">
-		<description>Tanigawa Kouji no Shougi Shinan III (Jpn)</description>
+		<description>Tanigawa Kouji no Shougi Shinan III (Japan)</description>
 		<year>1989</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-T3 (R58V5921)"/>
@@ -38301,7 +38306,7 @@ license:CC0
 	</software>
 
 	<software name="tjstnsmn">
-		<description>Tantei Jinguuji Saburou - Toki no Sugiyuku Mama ni (Jpn)</description>
+		<description>Tantei Jinguuji Saburou - Toki no Sugiyuku Mama ni (Japan)</description>
 		<year>1990</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-J4"/>
@@ -38321,7 +38326,7 @@ license:CC0
 	</software>
 
 	<software name="tao">
-		<description>Tao (Jpn)</description>
+		<description>Tao (Japan)</description>
 		<year>1989</year>
 		<publisher>Vap</publisher>
 		<info name="serial" value="VAP-BY"/>
@@ -38462,7 +38467,7 @@ license:CC0
 	</software>
 
 	<software name="tecmobwlj" cloneof="tecmobwl">
-		<description>Tecmo Bowl (Jpn)</description>
+		<description>Tecmo Bowl (Japan)</description>
 		<year>1990</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-TW"/>
@@ -38623,7 +38628,7 @@ license:CC0
 	</software>
 
 	<software name="tecmosbwj" cloneof="tecmosbw">
-		<description>Tecmo Super Bowl (Jpn)</description>
+		<description>Tecmo Super Bowl (Japan)</description>
 		<year>1991</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-4U"/>
@@ -38705,7 +38710,7 @@ license:CC0
 	</software>
 
 	<software name="tecmowcj" cloneof="tecmowc">
-		<description>Tecmo World Cup Soccer (Jpn)</description>
+		<description>Tecmo World Cup Soccer (Japan)</description>
 		<year>1990</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-WC"/>
@@ -39129,7 +39134,7 @@ license:CC0
 	</software>
 
 	<software name="teraozum">
-		<description>Terao no Dosukoi Oozumou (Jpn)</description>
+		<description>Terao no Dosukoi Oozumou (Japan)</description>
 		<year>1989</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-24"/>
@@ -39170,7 +39175,7 @@ license:CC0
 	</software>
 
 	<software name="terracrsj" cloneof="terracrs">
-		<description>Terra Cresta (Jpn)</description>
+		<description>Terra Cresta (Japan)</description>
 		<year>1986</year>
 		<publisher>Nihon Bussan</publisher>
 		<info name="serial" value="NBF-TC (03)"/>
@@ -39348,7 +39353,7 @@ license:CC0
 	</software>
 
 	<software name="tetr2bmba" cloneof="tetr2bmb">
-		<description>Tetris 2 + BomBliss (Jpn)</description>
+		<description>Tetris 2 + BomBliss (Japan)</description>
 		<year>1991</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="serial" value="BPS-52"/>
@@ -39372,7 +39377,7 @@ license:CC0
 	</software>
 
 	<software name="tetrisfl" cloneof="tetris2">
-		<description>Tetris Flash (Jpn)</description>
+		<description>Tetris Flash (Japan)</description>
 		<year>1993</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-TR"/>
@@ -39395,7 +39400,7 @@ license:CC0
 	</software>
 
 	<software name="tetsudo">
-		<description>Tetsudou Ou - Famicom Boardgame (Jpn)</description>
+		<description>Tetsudou Ou - Famicom Boardgame (Japan)</description>
 		<year>1987</year>
 		<publisher>dB-SOFT</publisher>
 		<info name="serial" value="DBF-RW"/>
@@ -39415,7 +39420,7 @@ license:CC0
 	</software>
 
 	<software name="tetsuwan">
-		<description>Tetsuwan Atom (Jpn)</description>
+		<description>Tetsuwan Atom (Japan)</description>
 		<year>1988</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC827"/>
@@ -39512,7 +39517,7 @@ license:CC0
 	</software>
 
 	<software name="tbirdsj" cloneof="tbirds">
-		<description>Thunderbirds (Jpn)</description>
+		<description>Thunderbirds (Japan)</description>
 		<year>1989</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="PAC-T5"/>
@@ -39569,7 +39574,7 @@ license:CC0
 	</software>
 
 	<software name="tigerhelj" cloneof="tigerhel">
-		<description>Tiger-Heli (Jpn)</description>
+		<description>Tiger-Heli (Japan)</description>
 		<year>1986</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-TH (R49V5905)"/>
@@ -39686,7 +39691,7 @@ license:CC0
 	</software>
 
 	<software name="timezone">
-		<description>Time Zone (Jpn)</description>
+		<description>Time Zone (Japan)</description>
 		<year>1991</year>
 		<publisher>Sigma Enterprises</publisher>
 		<info name="serial" value="SEI-1G"/>
@@ -39706,7 +39711,7 @@ license:CC0
 	</software>
 
 	<software name="timelorej" cloneof="timelore">
-		<description>Times of Lore (Jpn)</description>
+		<description>Times of Lore (Japan)</description>
 		<year>1990</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="THF-U7"/>
@@ -39745,7 +39750,7 @@ license:CC0
 	</software>
 
 	<software name="ttoonadvj" cloneof="ttoonadv">
-		<description>Tiny Toon Adventures (Jpn)</description>
+		<description>Tiny Toon Adventures (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC860"/>
@@ -39804,7 +39809,7 @@ license:CC0
 	</software>
 
 	<software name="ttoon2j" cloneof="ttoon2">
-		<description>Tiny Toon Adventures 2 - Montana Land e Youkoso (Jpn)</description>
+		<description>Tiny Toon Adventures 2 - Montana Land e Youkoso (Japan)</description>
 		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RV051"/>
@@ -40025,7 +40030,7 @@ license:CC0
 	</software>
 
 	<software name="timestrn">
-		<description>Toki no Tabibito - Time Stranger (Jpn)</description>
+		<description>Toki no Tabibito - Time Stranger (Japan)</description>
 		<year>1986</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-TS"/>
@@ -40045,7 +40050,7 @@ license:CC0
 	</software>
 
 	<software name="solbrain" cloneof="shatterh">
-		<description>Tokkyuu Shirei - Solbrain (Jpn)</description>
+		<description>Tokkyuu Shirei - Solbrain (Japan)</description>
 		<year>1991</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="ANG-OM"/>
@@ -40065,7 +40070,7 @@ license:CC0
 	</software>
 
 	<software name="tokoro">
-		<description>Tokoro-san no Mamoru mo Semeru mo (Jpn)</description>
+		<description>Tokoro-san no Mamoru mo Semeru mo (Japan)</description>
 		<year>1987</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="ESF-TO/49·6R-1"/>
@@ -40085,7 +40090,7 @@ license:CC0
 	</software>
 
 	<software name="tokyopsa">
-		<description>Tokyo Pachi Slot Adventure (Jpn, rev. A)</description>
+		<description>Tokyo Pachi Slot Adventure (Japan, rev. A)</description>
 		<year>1991</year>
 		<publisher>C*Dream</publisher>
 		<info name="serial" value="CDS-83"/>
@@ -40143,7 +40148,7 @@ license:CC0
 	</software>
 
 	<software name="tomsawyrj" cloneof="tomsawyr">
-		<description>Tom Sawyer no Bouken (Jpn)</description>
+		<description>Tom Sawyer no Bouken (Japan)</description>
 		<year>1989</year>
 		<publisher>Seta</publisher>
 		<info name="serial" value="KKS-YB (04)"/>
@@ -40200,7 +40205,7 @@ license:CC0
 	</software>
 
 	<software name="topgunj" cloneof="topgun">
-		<description>Top Gun (Jpn)</description>
+		<description>Top Gun (Japan)</description>
 		<year>1987</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-TG"/>
@@ -40277,7 +40282,7 @@ license:CC0
 	</software>
 
 	<software name="topgun2j" cloneof="topgun2">
-		<description>Top Gun - Dual Fighters (Jpn)</description>
+		<description>Top Gun - Dual Fighters (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-OG"/>
@@ -40378,7 +40383,7 @@ license:CC0
 	</software>
 
 	<software name="topstrik">
-		<description>Top Striker (Jpn)</description>
+		<description>Top Striker (Japan)</description>
 		<year>1992</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FTS-5800"/>
@@ -40493,7 +40498,7 @@ license:CC0
 	</software>
 
 	<software name="touhoukr">
-		<description>Touhou Kenbun Roku (Jpn)</description>
+		<description>Touhou Kenbun Roku (Japan)</description>
 		<year>1988</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="NAT-N1"/>
@@ -40513,7 +40518,7 @@ license:CC0
 	</software>
 
 	<software name="toukoncl">
-		<description>Toukon Club (Jpn)</description>
+		<description>Toukon Club (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-37"/>
@@ -40532,7 +40537,7 @@ license:CC0
 	</software>
 
 	<software name="druaga">
-		<description>The Tower of Druaga (Jpn)</description>
+		<description>The Tower of Druaga (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NTD-4900 (07)"/>
@@ -40685,7 +40690,7 @@ license:CC0
 	</software>
 
 	<software name="triathln">
-		<description>The Triathron (Jpn)</description>
+		<description>The Triathron (Japan)</description>
 		<year>1988</year>
 		<publisher>KAC</publisher>
 		<info name="serial" value="KAC-TZ"/>
@@ -40813,7 +40818,7 @@ license:CC0
 	</software>
 
 	<software name="tsuppari">
-		<description>Tsuppari Oozumou (Jpn)</description>
+		<description>Tsuppari Oozumou (Japan)</description>
 		<year>1987</year>
 		<publisher>Tecmo</publisher>
 		<info name="serial" value="TCF-TM"/>
@@ -40833,7 +40838,7 @@ license:CC0
 	</software>
 
 	<software name="tsuppwar" supported="partial">
-		<description>Tsuppari Wars (Jpn)</description>
+		<description>Tsuppari Wars (Japan)</description>
 		<year>1991</year>
 		<publisher>Sammy</publisher>
 		<info name="serial" value="SAC-7W"/>
@@ -40857,7 +40862,7 @@ license:CC0
 	</software>
 
 	<software name="tsurupik">
-		<description>Tsuru Pika Hagemaru - Mezase! Tsuru Seko no Akashi (Jpn)</description>
+		<description>Tsuru Pika Hagemaru - Mezase! Tsuru Seko no Akashi (Japan)</description>
 		<year>1991</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-34"/>
@@ -40918,7 +40923,7 @@ license:CC0
 	</software>
 
 	<software name="revjoeb" cloneof="twineagl">
-		<description>Twin Eagle - Revenge Joe's Brother (Jpn)</description>
+		<description>Twin Eagle - Revenge Joe's Brother (Japan)</description>
 		<year>1991</year>
 		<publisher>Visco</publisher>
 		<info name="serial" value="VIS-2E"/>
@@ -40957,7 +40962,7 @@ license:CC0
 	</software>
 
 	<software name="twinbee">
-		<description>TwinBee (Jpn)</description>
+		<description>TwinBee (Japan)</description>
 		<year>1986</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC807"/>
@@ -40977,7 +40982,7 @@ license:CC0
 	</software>
 
 	<software name="twinbee3">
-		<description>TwinBee 3 - Poko Poko Dai Maou (Jpn)</description>
+		<description>TwinBee 3 - Poko Poko Dai Maou (Japan)</description>
 		<year>1989</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC841"/>
@@ -41064,7 +41069,7 @@ license:CC0
 	</software>
 
 	<software name="usvball" cloneof="spikvbal">
-		<description>U.S. Championship V'Ball (Jpn)</description>
+		<description>U.S. Championship V'Ball (Japan)</description>
 		<year>1989</year>
 		<publisher>Technos Japan</publisher>
 		<info name="serial" value="TJC-VJ"/>
@@ -41084,7 +41089,7 @@ license:CC0
 	</software>
 
 	<software name="cosmocar">
-		<description>Uchuusen - Cosmo Carrier (Jpn)</description>
+		<description>Uchuusen - Cosmo Carrier (Japan)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-16"/>
@@ -41126,7 +41131,7 @@ license:CC0
 	</software>
 
 	<software name="ultima3j" cloneof="ultima3">
-		<description>Ultima - Exodus (Jpn)</description>
+		<description>Ultima - Exodus (Japan)</description>
 		<year>1987</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-UL (R59V5910)"/>
@@ -41173,7 +41178,7 @@ license:CC0
 	</software>
 
 	<software name="ultima4j" cloneof="ultima4">
-		<description>Ultima - Seija e no Michi (Jpn)</description>
+		<description>Ultima - Seija e no Michi (Japan)</description>
 		<year>1989</year>
 		<publisher>Pony Canyon</publisher>
 		<info name="serial" value="PNF-US (R59V5922)"/>
@@ -41312,7 +41317,7 @@ license:CC0
 	</software>
 
 	<software name="ultracl2">
-		<description>Ultraman Club 2 - Kaettekita Ultraman Club (Jpn)</description>
+		<description>Ultraman Club 2 - Kaettekita Ultraman Club (Japan)</description>
 		<year>1990</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHI-UU"/>
@@ -41332,7 +41337,7 @@ license:CC0
 	</software>
 
 	<software name="ultracl3">
-		<description>Ultraman Club 3 (Jpn)</description>
+		<description>Ultraman Club 3 (Japan)</description>
 		<year>1991</year>
 		<publisher>Yutaka</publisher>
 		<info name="serial" value="SHI-3I"/>
@@ -41356,7 +41361,7 @@ license:CC0
 	</software>
 
 	<software name="ultraclb">
-		<description>Ultraman Club - Kaijuu Dai Kessen!! (Jpn)</description>
+		<description>Ultraman Club - Kaijuu Dai Kessen!! (Japan)</description>
 		<year>1992</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="ANG-UA"/>
@@ -41501,7 +41506,7 @@ license:CC0
 	</software>
 
 	<software name="untouchj" cloneof="untouch">
-		<description>The Untouchables (Jpn)</description>
+		<description>The Untouchables (Japan)</description>
 		<year>1991</year>
 		<publisher>Altron</publisher>
 		<info name="serial" value="ALT-U6"/>
@@ -41542,7 +41547,7 @@ license:CC0
 	</software>
 
 	<software name="uruseiya">
-		<description>Urusei Yatsura - Lum no Wedding Bell (Jpn)</description>
+		<description>Urusei Yatsura - Lum no Wedding Bell (Japan)</description>
 		<year>1986</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-10"/>
@@ -41562,7 +41567,7 @@ license:CC0
 	</software>
 
 	<software name="usaiceh" cloneof="prohocky">
-		<description>USA Ice Hockey in FC (Jpn)</description>
+		<description>USA Ice Hockey in FC (Japan)</description>
 		<year>1993</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-40"/>
@@ -41598,7 +41603,7 @@ license:CC0
 	</software>
 
 	<software name="valis">
-		<description>Valis - The Fantastic Soldier (Jpn)</description>
+		<description>Valis - The Fantastic Soldier (Japan)</description>
 		<year>1987</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="serial" value="GTS-VA"/>
@@ -41618,7 +41623,7 @@ license:CC0
 	</software>
 
 	<software name="valkyrie">
-		<description>Valkyrie no Bouken - Toki no Kagi Densetsu (Jpn)</description>
+		<description>Valkyrie no Bouken - Toki no Kagi Densetsu (Japan)</description>
 		<year>1986</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NWB-3900 (17)"/>
@@ -41702,7 +41707,7 @@ license:CC0
 	</software>
 
 	<software name="venussnk">
-		<description>The Venus Wars - Venus Senki - Back The City "IO" (Jpn)</description>
+		<description>The Venus Wars - Venus Senki - Back The City "IO" (Japan)</description>
 		<year>1989</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="VRE-R2"/>
@@ -41790,7 +41795,7 @@ license:CC0
 	</software>
 
 	<software name="vivalv" cloneof="vegasdrm">
-		<description>Viva! Las Vegas (Jpn)</description>
+		<description>Viva! Las Vegas (Japan)</description>
 		<year>1988</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="ESF-LV/59·6R-2"/>
@@ -41813,7 +41818,7 @@ license:CC0
 	</software>
 
 	<software name="volguar2">
-		<description>Volguard II (Jpn)</description>
+		<description>Volguard II (Japan)</description>
 		<year>1985</year>
 		<publisher>dB-SOFT</publisher>
 		<info name="serial" value="DBF-VL"/>
@@ -42069,7 +42074,7 @@ license:CC0
 	</software>
 
 	<software name="wagyan">
-		<description>Wagyan Land (Jpn)</description>
+		<description>Wagyan Land (Japan)</description>
 		<year>1989</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-WL-4900"/>
@@ -42089,7 +42094,7 @@ license:CC0
 	</software>
 
 	<software name="wagyan2">
-		<description>Wagyan Land 2 (Jpn)</description>
+		<description>Wagyan Land 2 (Japan)</description>
 		<year>1990</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-WL2-5800"/>
@@ -42109,7 +42114,7 @@ license:CC0
 	</software>
 
 	<software name="wagyan3">
-		<description>Wagyan Land 3 (Jpn)</description>
+		<description>Wagyan Land 3 (Japan)</description>
 		<year>1992</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-FW3-5800"/>
@@ -42129,7 +42134,7 @@ license:CC0
 	</software>
 
 	<software name="waiwai2">
-		<description>Wai Wai World 2 - SOS!! Paseri Jou (Jpn)</description>
+		<description>Wai Wai World 2 - SOS!! Paseri Jou (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC850"/>
@@ -42187,7 +42192,7 @@ license:CC0
 	</software>
 
 	<software name="ducktalej" cloneof="ducktale">
-		<description>Wanpaku Duck Yume Bouken (Jpn)</description>
+		<description>Wanpaku Duck Yume Bouken (Japan)</description>
 		<year>1990</year>
 		<publisher>Capcom</publisher>
 		<info name="serial" value="CAP-UK"/>
@@ -42207,7 +42212,7 @@ license:CC0
 	</software>
 
 	<software name="gourmetw" cloneof="panicrst">
-		<description>Wanpaku Kokkun no Gourmet World (Jpn)</description>
+		<description>Wanpaku Kokkun no Gourmet World (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito / Disco</publisher>
 		<info name="serial" value="DTF-WK (43)"/>
@@ -42227,7 +42232,7 @@ license:CC0
 	</software>
 
 	<software name="wariowdj" cloneof="wariowd">
-		<description>Wario no Mori (Jpn)</description>
+		<description>Wario no Mori (Japan)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-UW"/>
@@ -42321,7 +42326,7 @@ license:CC0
 	</software>
 
 	<software name="warpman">
-		<description>Warpman (Jpn)</description>
+		<description>Warpman (Japan)</description>
 		<year>1985</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NWM-4500 (08)"/>
@@ -42585,7 +42590,7 @@ license:CC0
 	</software>
 
 	<software name="whitelio" cloneof="ghostlio">
-		<description>White Lion Densetsu (Jpn)</description>
+		<description>White Lion Densetsu (Japan)</description>
 		<year>1989</year>
 		<publisher>Kemco</publisher>
 		<info name="serial" value="KSC-WE"/>
@@ -42666,7 +42671,7 @@ license:CC0
 	</software>
 
 	<software name="wildgunm1" cloneof="wildgunm">
-		<description>Wild Gunman (Jpn, USA)</description><!-- Dump still to be confirmed from a Jpn cart -->
+		<description>Wild Gunman (Japan, USA)</description><!-- Dump still to be confirmed from a Japan cart -->
 		<year>1985</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="NES-WG-USA"/>
@@ -42885,7 +42890,7 @@ license:CC0
 	</software>
 
 	<software name="wizardr3">
-		<description>Wizardry III - Llylgamyn no Isan (Jpn)</description>
+		<description>Wizardry III - Llylgamyn no Isan (Japan)</description>
 		<year>1989</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-13"/>
@@ -42910,7 +42915,7 @@ license:CC0
 	</software>
 
 	<software name="wizardr2j" cloneof="wizardr2">
-		<description>Wizardry II - Diamond no Kishi (Jpn)</description>
+		<description>Wizardry II - Diamond no Kishi (Japan)</description>
 		<year>1990</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-32"/>
@@ -42958,7 +42963,7 @@ license:CC0
 	</software>
 
 	<software name="wizardryj" cloneof="wizardry">
-		<description>Wizardry - Proving Grounds of the Mad Overlord (Jpn)</description>
+		<description>Wizardry - Proving Grounds of the Mad Overlord (Japan)</description>
 		<year>1987</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-09"/>
@@ -43127,7 +43132,7 @@ license:CC0
 	</software>
 
 	<software name="woodypoc">
-		<description>Woody Poco (Jpn)</description>
+		<description>Woody Poco (Japan)</description>
 		<year>1987</year>
 		<publisher>dB-SOFT</publisher>
 		<info name="serial" value="DBF-UP"/>
@@ -43245,7 +43250,7 @@ license:CC0
 	</software>
 
 	<software name="worldgp" cloneof="turborac">
-		<description>World Grand-Prix - Pole to Finish (Jpn)</description>
+		<description>World Grand-Prix - Pole to Finish (Japan)</description>
 		<year>1989</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-FH"/>
@@ -43269,7 +43274,7 @@ license:CC0
 	</software>
 
 	<software name="worldten" cloneof="4ptennis">
-		<description>World Super Tennis (Jpn)</description>
+		<description>World Super Tennis (Japan)</description>
 		<year>1989</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="ASM-W1"/>
@@ -43385,7 +43390,7 @@ license:CC0
 	</software>
 
 	<software name="xeviousja" cloneof="xevious">
-		<description>Xevious (Jpn)</description>
+		<description>Xevious (Japan)</description>
 		<year>1984</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NXV-4900 (03)"/>
@@ -43405,7 +43410,7 @@ license:CC0
 	</software>
 
 	<software name="xeviousj" cloneof="xevious">
-		<description>Xevious (Jpn, v1.1)</description>
+		<description>Xevious (Japan, v1.1)</description>
 		<year>1984</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-NXV-4900 (03)"/>
@@ -43482,7 +43487,7 @@ license:CC0
 	</software>
 
 	<software name="yamaskhm">
-		<description>Yamamura Misa Suspense - Kyouto Hana no Misshitsu Satsujin Jiken (Jpn)</description>
+		<description>Yamamura Misa Suspense - Kyouto Hana no Misshitsu Satsujin Jiken (Japan)</description>
 		<year>1989</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="DTF-YM (22)"/>
@@ -43502,7 +43507,7 @@ license:CC0
 	</software>
 
 	<software name="yamaskrt">
-		<description>Yamamura Misa Suspense - Kyouto Ryuu no Tera Satsujin Jiken (Jpn)</description>
+		<description>Yamamura Misa Suspense - Kyouto Ryuu no Tera Satsujin Jiken (Japan)</description>
 		<year>1987</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-KR-5500 (14)"/>
@@ -43526,7 +43531,7 @@ license:CC0
 	</software>
 
 	<software name="yamaskzs">
-		<description>Yamamura Misa Suspense - Kyouto Zaiteku Satsujin Jiken (Jpn)</description>
+		<description>Yamamura Misa Suspense - Kyouto Zaiteku Satsujin Jiken (Japan)</description>
 		<year>1990</year>
 		<publisher>Hector</publisher>
 		<info name="serial" value="HCT-QZ/008"/>
@@ -43550,7 +43555,7 @@ license:CC0
 	</software>
 
 	<software name="yieara" cloneof="yiear">
-		<description>Yie Ar Kung Fu (Jpn, v1.2)</description>
+		<description>Yie Ar Kung Fu (Japan, v1.2)</description>
 		<year>1985</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC802"/>
@@ -43571,7 +43576,7 @@ license:CC0
 	</software>
 
 	<software name="yiear">
-		<description>Yie Ar Kung Fu (Jpn, v1.4)</description>
+		<description>Yie Ar Kung Fu (Japan, v1.4)</description>
 		<year>1985</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KON-RC802"/>
@@ -43636,7 +43641,7 @@ license:CC0
 	</software>
 
 	<software name="yoshicokj" cloneof="yoshicok">
-		<description>Yoshi no Cookie (Jpn)</description>
+		<description>Yoshi no Cookie (Japan)</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-CI"/>
@@ -43656,7 +43661,7 @@ license:CC0
 	</software>
 
 	<software name="yoshij" cloneof="marioyos">
-		<description>Yoshi no Tamago (Jpn)</description>
+		<description>Yoshi no Tamago (Japan)</description>
 		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-YO"/>
@@ -43714,7 +43719,7 @@ license:CC0
 	</software>
 
 	<software name="youkaicl">
-		<description>Youkai Club (Jpn)</description>
+		<description>Youkai Club (Japan)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-12"/>
@@ -43734,7 +43739,7 @@ license:CC0
 	</software>
 
 	<software name="youkaid">
-		<description>Youkai Douchuuki (Jpn)</description>
+		<description>Youkai Douchuuki (Japan)</description>
 		<year>1988</year>
 		<publisher>Namcot</publisher>
 		<info name="serial" value="NAM-YD-4900"/>
@@ -43776,7 +43781,7 @@ license:CC0
 	</software>
 
 	<software name="ys">
-		<description>Ys (Jpn)</description>
+		<description>Ys (Japan)</description>
 		<year>1988</year>
 		<publisher>Victor Ongaku Sangyou</publisher>
 		<info name="serial" value="VFR-Y2 (05)"/>
@@ -43800,7 +43805,7 @@ license:CC0
 	</software>
 
 	<software name="ys2">
-		<description>Ys II - Ancient Ys Vanished - The Final Chapter (Jpn)</description>
+		<description>Ys II - Ancient Ys Vanished - The Final Chapter (Japan)</description>
 		<year>1990</year>
 		<publisher>Victor Ongaku Sangyou</publisher>
 		<info name="serial" value="VFR-Q2 (09)"/>
@@ -43824,7 +43829,7 @@ license:CC0
 	</software>
 
 	<software name="ys3">
-		<description>Ys III - Wanderers from Ys (Jpn)</description>
+		<description>Ys III - Wanderers from Ys (Japan)</description>
 		<year>1991</year>
 		<publisher>Victor Ongaku Sangyou</publisher>
 		<info name="serial" value="VFR-Q8 (12)"/>
@@ -43848,7 +43853,7 @@ license:CC0
 	</software>
 
 	<software name="yumepeng">
-		<description>Yume Penguin Monogatari (Jpn)</description>
+		<description>Yume Penguin Monogatari (Japan)</description>
 		<year>1991</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-U8"/>
@@ -43979,7 +43984,7 @@ license:CC0
 	</software>
 
 	<software name="zeldaj" cloneof="zelda">
-		<description>Zelda no Densetsu 1 - The Hyrule Fantasy (Jpn)</description>
+		<description>Zelda no Densetsu 1 - The Hyrule Fantasy (Japan)</description>
 		<year>1994</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-ZL"/>
@@ -44040,7 +44045,7 @@ license:CC0
 	</software>
 
 	<software name="zenbei" cloneof="allprobb">
-		<description>Zenbei!! Pro Basket (Jpn)</description>
+		<description>Zenbei!! Pro Basket (Japan)</description>
 		<year>1989</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="VIC-A2"/>
@@ -44060,7 +44065,7 @@ license:CC0
 	</software>
 
 	<software name="zippyrac">
-		<description>Zippy Race (Jpn)</description>
+		<description>Zippy Race (Japan)</description>
 		<year>1985</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-01"/>
@@ -44102,7 +44107,7 @@ license:CC0
 	</software>
 
 	<software name="zoids2">
-		<description>Zoids 2 - Zenebasu no Gyakushuu (Japan)</description>
+		<description>Zoids 2 - Zenebas no Gyakushuu (Japan)</description>
 		<year>1989</year>
 		<publisher>Toemiland</publisher>
 		<info name="serial" value="TFS-Z2"/>
@@ -44225,7 +44230,7 @@ license:CC0
 	</software>
 
 	<software name="galg">
-		<description>Zunou Senkan Galg (Jpn)</description>
+		<description>Zunou Senkan Galg (Japan)</description>
 		<year>1985</year>
 		<publisher>dB-SOFT</publisher>
 		<info name="serial" value="DBF-GA"/>
@@ -44261,7 +44266,7 @@ license:CC0
 	</software>
 
 	<software name="hvckenct">
-		<description>HVC Kensa Cassette Controller Test (Jpn)</description>
+		<description>HVC Kensa Cassette Controller Test (Japan)</description>
 		<year>19??</year>
 		<publisher>Nintendo?</publisher>
 		<part name="cart" interface="nes_cart">
@@ -44497,7 +44502,7 @@ We should eventually add it to MAME as a separate driver with a NES CPU and a GB
 
 <!-- This might be the dump of the bios. Investigate... -->
 	<software name="fctitler">
-		<description>Sharp Famicom Titler (Jpn)</description>
+		<description>Sharp Famicom Titler (Japan)</description>
 		<year>1989</year>
 		<publisher>Sharp</publisher>
 		<info name="alt_title" value="ファミコンタイトラー"/>
@@ -44519,7 +44524,7 @@ We should eventually add it to MAME as a separate driver with a NES CPU and a GB
 
 <!-- This might be the dump of the bios. Investigate... -->
 	<software name="myctv">
-		<description>My Computer TV C1 (Jpn)</description>
+		<description>My Computer TV C1 (Japan)</description>
 		<year>1983</year>
 		<publisher>Sharp</publisher>
 		<info name="alt_title" value="マイコンピュータテレビC1"/>
@@ -44664,7 +44669,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="abadoxj" cloneof="abadox">
-		<description>Abadox (Jpn)</description>
+		<description>Abadox (Japan)</description>
 		<year>1989</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="NAT-A3"/>
@@ -44683,7 +44688,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="abatengu" cloneof="zombinat">
-		<description>Abarenbou Tengu (Jpn)</description>
+		<description>Abarenbou Tengu (Japan)</description>
 		<year>1990</year>
 		<publisher>Meldac</publisher>
 		<info name="serial" value="MDC-51"/>
@@ -44786,7 +44791,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="aisensei">
-		<description>Ai Sensei no Oshiete - Watashi no Hoshi (Jpn)</description>
+		<description>Ai Sensei no Oshiete - Watashi no Hoshi (Japan)</description>
 		<year>1993</year>
 		<publisher>Irem</publisher>
 		<info name="serial" value="IF-27"/>
@@ -44879,7 +44884,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="aliensynj" cloneof="aliensyn">
-		<description>Alien Syndrome (Jpn)</description>
+		<description>Alien Syndrome (Japan)</description>
 		<year>1988</year>
 		<publisher>Sunsoft</publisher>
 		<info name="serial" value="SAN-AZ"/>
@@ -45057,7 +45062,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="bananap2" cloneof="banana">
-		<description>Banana (Jpn, prototype 06/30)</description>
+		<description>Banana (Japan, prototype 06/30)</description>
 		<year>1986</year>
 		<publisher>Victor</publisher>
 		<part name="cart" interface="nes_cart">
@@ -45153,7 +45158,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="bbfightr">
-		<description>Baseball Fighter (Jpn)</description>
+		<description>Baseball Fighter (Japan)</description>
 		<year>1991</year>
 		<publisher>Vap</publisher>
 		<info name="serial" value="VAP-V9"/>
@@ -45208,7 +45213,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="batbaseb">
-		<description>Battle Baseball (Jpn)</description>
+		<description>Battle Baseball (Japan)</description>
 		<year>1993</year>
 		<publisher>Banpresto</publisher>
 		<info name="serial" value="BAP-1Z"/>
@@ -45248,7 +45253,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="dstalla" cloneof="dstall">
-		<description>Best Keiba - Derby Stallion (Jpn)</description>
+		<description>Best Keiba - Derby Stallion (Japan)</description>
 		<year>1991</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-46"/>
@@ -45272,7 +45277,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="proyaksp1" cloneof="proyaksp">
-		<description>The Best Play Pro Yakyuu Special (Jpn)</description>
+		<description>The Best Play Pro Yakyuu Special (Japan)</description>
 		<year>1992</year>
 		<publisher>ASCII</publisher>
 		<info name="serial" value="HSP-BS"/>
@@ -45423,7 +45428,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="bublbob2j" cloneof="bublbob2">
-		<description>Bubble Bobble 2 (Jpn)</description>
+		<description>Bubble Bobble 2 (Japan)</description>
 		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-BB-5900 (47)"/>
@@ -45491,7 +45496,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="business">
-		<description>Business Wars (Jpn)</description>
+		<description>Business Wars (Japan)</description>
 		<year>1991</year>
 		<publisher>Hector</publisher>
 		<info name="serial" value="HCT-078/013"/>
@@ -45619,7 +45624,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="captsavr" cloneof="powblad2">
-		<description>Captain Saver (Jpn)</description>
+		<description>Captain Saver (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-CS-5900 (46)"/>
@@ -45638,7 +45643,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="chaoswld">
-		<description>Chaos World (Jpn)</description>
+		<description>Chaos World (Japan)</description>
 		<year>1991</year>
 		<publisher>Natsume</publisher>
 		<info name="serial" value="NAT-1W"/>
@@ -45677,7 +45682,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="chiisana">
-		<description>Chiisana Obake - Acchi Socchi Kocchi (Jpn)</description>
+		<description>Chiisana Obake - Acchi Socchi Kocchi (Japan)</description>
 		<year>1992</year>
 		<publisher>Vap</publisher>
 		<info name="serial" value="VAP-AV"/>
@@ -45696,7 +45701,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="chikirac" cloneof="wackyrac">
-		<description>Chiki Chiki Machine Mou Race (Jpn)</description>
+		<description>Chiki Chiki Machine Mou Race (Japan)</description>
 		<year>1991</year>
 		<publisher>Atlus</publisher>
 		<info name="serial" value="ATL-5I"/>
@@ -45949,7 +45954,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="columbuss" cloneof="columbus">
-		<description>Columbus - Ougon no Yoake (Jpn, sample)</description>
+		<description>Columbus - Ougon no Yoake (Japan, sample)</description>
 		<year>1992</year>
 		<publisher>Tomy</publisher>
 		<part name="cart" interface="nes_cart">
@@ -46131,7 +46136,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="darklord">
-		<description>Dark Lord (Jpn)</description>
+		<description>Dark Lord (Japan)</description>
 		<year>1991</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-25"/>
@@ -46154,7 +46159,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="deblock">
-		<description>De-Block (Jpn)</description>
+		<description>De-Block (Japan)</description>
 		<year>1991</year>
 		<publisher>Athena</publisher>
 		<info name="serial" value="ATH-9L"/>
@@ -46286,7 +46291,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="bigbang" cloneof="clashdmn">
-		<description>Dengeki - Big Bang! (Jpn)</description>
+		<description>Dengeki - Big Bang! (Japan)</description>
 		<year>1989</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="VIC-B6"/>
@@ -46322,7 +46327,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="diehardj" cloneof="diehard">
-		<description>Die Hard (Jpn)</description>
+		<description>Die Hard (Japan)</description>
 		<year>1991</year>
 		<publisher>Pack-In-Video</publisher>
 		<info name="serial" value="PAC-57"/>
@@ -46373,7 +46378,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="dkongjrj" cloneof="dkongjr">
-		<description>Donkey Kong Jr. (Jpn)</description>
+		<description>Donkey Kong Jr. (Japan)</description>
 		<year>1983</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-JR"/>
@@ -46712,7 +46717,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="elevatorj" cloneof="elevator">
-		<description>Elevator Action (Jpn, rev. A)</description>
+		<description>Elevator Action (Japan, rev. A)</description>
 		<year>1985</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-EA-4900 (04)"/>
@@ -46804,7 +46809,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="exrally" cloneof="chrally">
-		<description>Exciting Rally - World Rally Championship (Jpn)</description>
+		<description>Exciting Rally - World Rally Championship (Japan)</description>
 		<year>1992</year>
 		<publisher>Kakenhi</publisher>
 		<info name="serial" value="VRE-E2"/>
@@ -46823,7 +46828,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="f1racep" cloneof="f1race">
-		<description>F-1 Race (Jpn, prototype)</description>
+		<description>F-1 Race (Japan, prototype)</description>
 		<year>1984</year>
 		<publisher>Nintendo</publisher>
 		<info name="alt_title" value="F1レース"/>
@@ -46842,7 +46847,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="f1senstnj" cloneof="f1senstn">
-		<description>F-1 Sensation (Jpn)</description>
+		<description>F-1 Sensation (Japan)</description>
 		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="serial" value="KDS-FE"/>
@@ -46974,7 +46979,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="famischl">
-		<description>Family School (Jpn)</description>
+		<description>Family School (Japan)</description>
 		<year>19??</year>
 		<publisher>Tokyo Shoseki</publisher>
 		<info name="serial" value="TKS-D1"/>
@@ -47074,7 +47079,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="flintj" cloneof="flint">
-		<description>The Flintstones - The Rescue of Dino &amp; Hoppy (Jpn)</description>
+		<description>The Flintstones - The Rescue of Dino &amp; Hoppy (Japan)</description>
 		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-FS-6800 (45)"/>
@@ -47149,7 +47154,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="boynblobj" cloneof="boynblob">
-		<description>Fushigi Na Blobby - Blobania no Kiki (Jpn)</description>
+		<description>Fushigi Na Blobby - Blobania no Kiki (Japan)</description>
 		<year>1990</year>
 		<publisher>Jaleco / DCE</publisher>
 		<info name="serial" value="DCE-OV"/>
@@ -47168,7 +47173,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="nadia">
-		<description>Fushigi no Umi no Nadia (Jpn)</description>
+		<description>Fushigi no Umi no Nadia (Japan)</description>
 		<year>1991</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="THF-FD"/>
@@ -47247,7 +47252,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="gameprty">
-		<description>Game Party (Jpn)</description>
+		<description>Game Party (Japan)</description>
 		<year>1990</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-P8"/>
@@ -47266,7 +47271,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="garfieldp" cloneof="garfield">
-		<description>Garfield - A Week of Garfield (Jpn, prototype v0.9)</description>
+		<description>Garfield - A Week of Garfield (Japan, prototype v0.9)</description>
 		<year>1989</year>
 		<publisher>Towa Chiki</publisher>
 		<part name="cart" interface="nes_cart">
@@ -47394,7 +47399,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="goalj" cloneof="goal2">
-		<description>Goal!! (Jpn)</description>
+		<description>Goal!! (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-38"/>
@@ -47473,7 +47478,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="gradiusah" cloneof="gradius">
-		<description>Gradius (Jpn, ArchiMENdes Hen Version)</description>
+		<description>Gradius (Japan, ArchiMENdes Hen Version)</description>
 		<year>198?</year>
 		<publisher>Konami</publisher>
 		<part name="cart" interface="nes_cart">
@@ -47490,7 +47495,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="granmstr">
-		<description>Grand Master (Jpn)</description>
+		<description>Grand Master (Japan)</description>
 		<year>1991</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="VRE-IE"/>
@@ -47509,7 +47514,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="greatdl">
-		<description>Great Deal (Jpn)</description>
+		<description>Great Deal (Japan)</description>
 		<year>1991</year>
 		<publisher>Hector</publisher>
 		<info name="serial" value="HCT-79/012"/>
@@ -48031,7 +48036,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="jangou">
-		<description>Jangou (Jpn)</description>
+		<description>Jangou (Japan)</description>
 		<year>1990</year>
 		<publisher>Victor Ongaku Sangyou</publisher>
 		<info name="serial" value="VFR-Q3 (10)"/>
@@ -48054,7 +48059,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="jetsonsj" cloneof="jetsons">
-		<description>The Jetsons - Cogswell's Caper! (Jpn)</description>
+		<description>The Jetsons - Cogswell's Caper! (Japan)</description>
 		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="serial" value="TFC-JS-6800 (48)"/>
@@ -48091,7 +48096,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="joustj" cloneof="joust">
-		<description>Joust (Jpn)</description>
+		<description>Joust (Japan)</description>
 		<year>1987</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-JU"/>
@@ -48294,7 +48299,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="zgundamfv" cloneof="zgundam">
-		<description>Kidou Senshi Z Gundam - Hot Scramble (Jpn, Final Version release)</description>
+		<description>Kidou Senshi Z Gundam - Hot Scramble (Japan, Final Version release)</description>
 		<year>1986?</year>
 		<publisher>Bandai</publisher>
 		<part name="cart" interface="nes_cart">
@@ -48410,7 +48415,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="villgust">
-		<description>Kouryuu Densetsu Villgust Gaiden (Jpn)</description>
+		<description>Kouryuu Densetsu Villgust Gaiden (Japan)</description>
 		<year>1993</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="ANG-VI"/>
@@ -48433,7 +48438,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="kyorolnd" cloneof="casteln">
-		<description>Kyoro-chan Land (Jpn)</description>
+		<description>Kyoro-chan Land (Japan)</description>
 		<year>1992</year>
 		<publisher>Hiro</publisher>
 		<info name="serial" value="HIR-KC"/>
@@ -48453,7 +48458,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="zyurangr">
-		<description>Kyouryuu Sentai Zyuranger (Jpn)</description>
+		<description>Kyouryuu Sentai Zyuranger (Japan)</description>
 		<year>1992</year>
 		<publisher>Angel</publisher>
 		<info name="serial" value="ANG-JF"/>
@@ -48594,7 +48599,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="magdorop" cloneof="krion">
-		<description>Magical Doropie (Jpn)</description>
+		<description>Magical Doropie (Japan)</description>
 		<year>1990</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="serial" value="VIC-VF"/>
@@ -48670,7 +48675,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mahjongb" cloneof="mahjong">
-		<description>Mahjong (Jpn)</description>
+		<description>Mahjong (Japan)</description>
 		<year>1983</year>
 		<publisher>Nintendo</publisher>
 		<info name="serial" value="HVC-MJ"/>
@@ -48827,7 +48832,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 		<publisher>Vap</publisher>
 		<info name="serial" value="VAP-ZN"/>
 		<info name="release" value="19910215"/>
-		<info name="alt_title" value="マックスウォリアー 惑星戒厳令"/>
+		<info name="alt_title" value="マックス・ウォーリアー 〜惑星戒厳令〜"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="txrom" />
 			<feature name="pcb" value="NES-TLROM" />
@@ -49102,7 +49107,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="millipedj" cloneof="milliped">
-		<description>Millipede (Jpn)</description>
+		<description>Millipede (Japan)</description>
 		<year>1987</year>
 		<publisher>HAL Kenkyuujo</publisher>
 		<info name="serial" value="HAL-ML"/>
@@ -49123,7 +49128,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="milonjp" cloneof="milon">
-		<description>Meikyuu Kumikyoku - Milon no Daibouken (Jpn, prototype)</description>
+		<description>Meikyuu Kumikyoku - Milon no Daibouken (Japan, prototype)</description>
 		<year>1986</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="alt_title" value="迷宮組曲 ミロンの大冒険"/>
@@ -49279,7 +49284,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="moeonisn">
-		<description>Moeru! Oniisan (Jpn)</description>
+		<description>Moeru! Oniisan (Japan)</description>
 		<year>1989</year>
 		<publisher>Toho</publisher>
 		<info name="serial" value="THF-M7"/>
@@ -49298,7 +49303,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="momogdn">
-		<description>Momotarou Densetsu Gaiden (Jpn)</description>
+		<description>Momotarou Densetsu Gaiden (Japan)</description>
 		<year>1993</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="serial" value="HVC-MV"/>
@@ -49354,7 +49359,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mooncrys">
-		<description>Moon Crystal (Jpn)</description>
+		<description>Moon Crystal (Japan)</description>
 		<year>1992</year>
 		<publisher>Hector</publisher>
 		<info name="serial" value="HCT-MS/017"/>
@@ -49436,7 +49441,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="nantbbs" cloneof="nantbb">
-		<description>Nantettatte!! Baseball (Jpn, sample)</description>
+		<description>Nantettatte!! Baseball (Japan, sample)</description>
 		<year>1990</year>
 		<publisher>Sunsoft</publisher>
 		<part name="cart" interface="nes_cart">
@@ -49456,7 +49461,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="dunkhero">
-		<description>Nekketsu! Street Basket - Ganbare Dunk Heroes (Jpn)</description>
+		<description>Nekketsu! Street Basket - Ganbare Dunk Heroes (Japan)</description>
 		<year>1993</year>
 		<publisher>Technos</publisher>
 		<info name="serial" value="TJC-BR"/>
@@ -49545,7 +49550,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="nipponmk">
-		<description>Nippon'ichi no Meikantoku (Jpn)</description>
+		<description>Nippon'ichi no Meikantoku (Japan)</description>
 		<year>1990</year>
 		<publisher>Asmik</publisher>
 		<info name="serial" value="ASM-N8"/>
@@ -49671,7 +49676,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="ninjashs">
-		<description>Ninja-kun - Ashura no Shou (Jpn)</description>
+		<description>Ninja-kun - Ashura no Shou (Japan)</description>
 		<year>1988</year>
 		<publisher>UPL</publisher>
 		<info name="serial" value="UPL-NJ"/>
@@ -49934,7 +49939,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="paralwld">
-		<description>Parallel World (Jpn)</description>
+		<description>Parallel World (Japan)</description>
 		<year>1990</year>
 		<publisher>Varie</publisher>
 		<info name="serial" value="VRE-R9"/>
@@ -50087,7 +50092,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="punchoutj" cloneof="punchout">
-		<description>Punch-Out!! (Jpn, Gold Edition)</description>
+		<description>Punch-Out!! (Japan, Gold Edition)</description>
 		<year>19??</year>
 		<publisher>Nintendo</publisher>
 		<part name="cart" interface="nes_cart">
@@ -50229,7 +50234,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="radac">
-		<description>Radac Tailor-Made (Jpn)</description>
+		<description>Radac Tailor-Made (Japan)</description>
 		<year>19??</year>
 		<publisher>Bridgestone ~ Tokyo Shoseki</publisher>
 		<part name="cart" interface="nes_cart">
@@ -50365,7 +50370,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="robocopj" cloneof="robocop">
-		<description>RoboCop (Jpn)</description>
+		<description>RoboCop (Japan)</description>
 		<year>1989</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-CP"/>
@@ -50455,7 +50460,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="rodlandj" cloneof="rodland">
-		<description>Rod Land (Jpn)</description>
+		<description>Rod Land (Japan)</description>
 		<year>1992</year>
 		<publisher>Jaleco</publisher>
 		<info name="serial" value="JF-39"/>
@@ -50475,7 +50480,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="rpgjins">
-		<description>RPG Jinsei Game (Jpn)</description>
+		<description>RPG Jinsei Game (Japan)</description>
 		<year>1993</year>
 		<publisher>Takara</publisher>
 		<info name="serial" value="TFC-LI"/>
@@ -50638,7 +50643,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="sansu56n">
-		<description>Sansuu 5 &amp; 6 Nen - Keisan Game (Jpn)</description>
+		<description>Sansuu 5 &amp; 6 Nen - Keisan Game (Japan)</description>
 		<year>1986</year>
 		<publisher>Tokyo Shoseki</publisher>
 		<info name="serial" value="TKS-S5"/>
@@ -50898,7 +50903,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="snowbrosj" cloneof="snowbros">
-		<description>Snow Bros. (Jpn)</description>
+		<description>Snow Bros. (Japan)</description>
 		<year>1991</year>
 		<publisher>Toaplan</publisher>
 		<info name="serial" value="TOA-7L"/>
@@ -51083,7 +51088,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="starsoldsp" cloneof="starsold">
-		<description>Star Soldier Special Version (Jpn, Competition Version?)</description>
+		<description>Star Soldier Special Version (Japan, Competition Version?)</description>
 		<year>1986</year>
 		<publisher>Hudson Soft</publisher>
 		<part name="cart" interface="nes_cart">
@@ -51225,7 +51230,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<!-- This would need tape emulation and real tapes dumped -->
 	<software name="studybox">
-		<description>Study Box (Jpn)</description>
+		<description>Study Box (Japan)</description>
 		<year>19??</year>
 		<publisher>Fukutake Shoten</publisher>
 		<part name="cart" interface="nes_cart">
@@ -51357,7 +51362,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="spinb">
-		<description>Super Pinball (Jpn)</description>
+		<description>Super Pinball (Japan)</description>
 		<year>1988</year>
 		<publisher>Coconuts Japan</publisher>
 		<info name="serial" value="CDS-PJ"/>
@@ -51468,7 +51473,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="tagteamjsp" cloneof="tagteam">
-		<description>Tag Team Pro Wrestling (Jpn, Special release)</description>
+		<description>Tag Team Pro Wrestling (Japan, Special release)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -51538,7 +51543,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="tjsyrsj">
-		<description>Tantei Jinguuji Saburou - Yokohamakou Renzoku Satsujin Jiken (Jpn)</description>
+		<description>Tantei Jinguuji Saburou - Yokohamakou Renzoku Satsujin Jiken (Japan)</description>
 		<year>1988</year>
 		<publisher>Data East</publisher>
 		<info name="serial" value="DFC-YK"/>
@@ -51557,7 +51562,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="tashimp">
-		<description>Tashiro Masashi no Princess ga Ippai (Jpn)</description>
+		<description>Tashiro Masashi no Princess ga Ippai (Japan)</description>
 		<year>1989</year>
 		<publisher>Epic / Sony Records</publisher>
 		<info name="serial" value="ESF-P0/55・6R-4"/>
@@ -51930,7 +51935,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="tokyopsa1" cloneof="tokyopsa">
-		<description>Tokyo Pachi Slot Adventure (Jpn)</description>
+		<description>Tokyo Pachi Slot Adventure (Japan)</description>
 		<year>1991</year>
 		<publisher>C*Dream</publisher>
 		<info name="serial" value="CDS-83"/>
@@ -52445,7 +52450,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="worldbox">
-		<description>World Boxing (Jpn)</description>
+		<description>World Boxing (Japan)</description>
 		<year>1990</year>
 		<publisher>TSS</publisher>
 		<info name="serial" value="TSS-W7"/>
@@ -52464,7 +52469,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="wmaniachj" cloneof="wmaniach">
-		<description>WWF WrestleMania Challenge (Jpn)</description>
+		<description>WWF WrestleMania Challenge (Japan)</description>
 		<year>1992</year>
 		<publisher>Hot-B</publisher>
 		<info name="serial" value="GAM-W9 (11)"/>
@@ -52644,7 +52649,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="wangphz">
-		<description>Wang Pai Hai Zhan (Chi)</description>
+		<description>Wang Pai Hai Zhan (China)</description>
 		<year>19??</year>
 		<publisher>TCL</publisher>
 		<part name="cart" interface="nes_cart">
@@ -53818,7 +53823,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	<software name="jovial">
 		<!-- Important: there is also an image with prg crc 55089f7e which according to my research
 		should be a Chinese translation by Puszta of the original Sachen game, so we don't include it here -->
-		<description>Jovial Race (Tw, NES cart)</description>
+		<description>Jovial Race (Taiwan, NES cart)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<info name="serial" value="TC-001"/>
@@ -53853,7 +53858,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<software name="hidchess">
 		<!-- Um Chi (Glommy Chess, Joy Van) in GoodNES, check title -->
-		<description>An Qi ~ Hidden Chinese Chess (Tw)</description>
+		<description>An Qi ~ Hidden Chinese Chess (Taiwan)</description>
 		<year>1989</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="TC-002"/>
@@ -53872,7 +53877,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="sidewinda" cloneof="sidewind">
-		<description>Sidewinder - Xiang Wei She (Tw, NES cart)</description>
+		<description>Sidewinder - Xiang Wei She (Taiwan, NES cart)</description>
 		<year>1989</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="TC-003"/>
@@ -54001,7 +54006,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="twineagh">
-		<description>Twin Eagle (Tw, NES cart)</description>
+		<description>Twin Eagle (Taiwan, NES cart)</description>
 		<year>1989</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="TC-006"/>
@@ -54019,7 +54024,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="twineagha" cloneof="twineagh">
-		<description>Shuang Ying (Tw, FC cart)</description>
+		<description>Shuang Ying (Taiwan, FC cart)</description>
 		<year>1989</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="TC-006"/>
@@ -54038,7 +54043,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 <!-- is this good? check -->
 	<software name="shuang" cloneof="twineagh">
-		<description>Shuang Ying (Tw)</description>
+		<description>Shuang Ying (Taiwan)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<info name="alt_title" value="Twin Eagle"/>
@@ -54056,7 +54061,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mastrchua" cloneof="mastrchu">
-		<description>Master Chu &amp; Drunkard Hu (Tw, Pal)</description>
+		<description>Master Chu &amp; Drunkard Hu (Taiwan, PAL)</description>
 		<year>19??</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="TC-007"/>
@@ -54110,7 +54115,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="galcrusa" cloneof="galcrus">
-		<description>Galactic Crusader (Tw, NES cart)</description>
+		<description>Galactic Crusader (Taiwan, NES cart)</description>
 		<year>1990</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="TC-009"/>
@@ -54147,7 +54152,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mjtrapz">
-		<description>Mahjong Trap - Si Cuan Ma Que - Zhi Fu Pian (Tw)</description>
+		<description>Mahjong Trap - Si Cuan Ma Que - Zhi Fu Pian (Taiwan)</description>
 		<!-- Shisen Mahjong - Seifuku Hen (Sachen) in GoodNES, check title -->
 		<year>1990</year>
 		<publisher>Sachen</publisher>
@@ -54167,7 +54172,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="chaldrgna" cloneof="chaldrgn">
-		<description>Challenge of the Dragon (Tw, NES cart)</description>
+		<description>Challenge of the Dragon (Taiwan, NES cart)</description>
 		<year>1990</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="TC-011"/>
@@ -54717,7 +54722,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart1">
-		<description>Super Cartridge Ver 1 - 4 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 1 - 4 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="TC-SC1"/>
@@ -54734,7 +54739,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart2">
-		<description>Super Cartridge Ver 2 - 10 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 2 - 10 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -54750,7 +54755,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart3">
-		<description>Super Cartridge Ver 3 - 8 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 3 - 8 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -54766,7 +54771,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart4">
-		<description>Super Cartridge Ver 4 - 6 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 4 - 6 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -54782,7 +54787,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart5">
-		<description>Super Cartridge Ver 5 - 7 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 5 - 7 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -54798,7 +54803,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart6">
-		<description>Super Cartridge Ver 6 - 6 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 6 - 6 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -54814,7 +54819,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart7">
-		<description>Super Cartridge Ver 7 - 4 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 7 - 4 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -54830,7 +54835,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart8">
-		<description>Super Cartridge Ver 8 - 4 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 8 - 4 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -54846,7 +54851,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="supcart9">
-		<description>Super Cartridge Ver 9 - 3 in 1 (Tw)</description>
+		<description>Super Cartridge Ver 9 - 3 in 1 (Taiwan)</description>
 		<year>1994</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -54918,7 +54923,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<!-- SA-002 is Penguin and Seal, and its dump coincides with the HES version, Arctic Adventure -->
 	<software name="pengseal">
-		<description>The Penguin &amp; Seal (Tw, Aus)</description>
+		<description>The Penguin &amp; Seal (Taiwan, Australia)</description>
 		<year>1989</year>
 		<publisher>Sachen ~ HES</publisher>
 		<info name="serial" value="SA-002"/>
@@ -54938,7 +54943,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 <!-- nointro -->
 	<software name="dongdong" cloneof="pengseal">
-		<description>Dong Dong Nao 1 (Tw)</description>
+		<description>Dong Dong Nao 1 (Taiwan)</description>
 		<year>1989</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-002"/>
@@ -54996,7 +55001,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="lucky777">
-		<description>777 Lucky Bingo (Tw, NES cart)</description>
+		<description>777 Lucky Bingo (Taiwan, NES cart)</description>
 		<year>1989</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-004"/>
@@ -55015,7 +55020,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="colorful">
-		<description>Colorful Dragon (Tw, NES cart)</description>
+		<description>Colorful Dragon (Taiwan, NES cart)</description>
 		<year>1989</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-005"/>
@@ -55375,7 +55380,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="pokermj">
-		<description>Poker Mahjong - Pu Ke Mao Que (Tw)</description>
+		<description>Poker Mahjong - Pu Ke Mao Que (Taiwan)</description>
 		<year>19??</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-018"/>
@@ -55393,7 +55398,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="greatwl">
-		<description>The Great Wall (Tw, NES cart)</description>
+		<description>The Great Wall (Taiwan, NES cart)</description>
 		<year>1992</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-019"/>
@@ -55410,7 +55415,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="fcombat">
-		<description>Final Combat (Tw, FC cart)</description>
+		<description>Final Combat (Taiwan, FC cart)</description>
 		<year>1992</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-020"/>
@@ -55427,7 +55432,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="fcombata" cloneof="fcombat">
-		<description>Final Combat (Tw, NES cart)</description>
+		<description>Final Combat (Taiwan, NES cart)</description>
 		<year>1992</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-020"/>
@@ -55444,7 +55449,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="tasac">
-		<description>Tasac (Tw)</description>
+		<description>Tasac (Taiwan)</description>
 		<year>1992</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-021"/>
@@ -55481,7 +55486,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="2ccopcm">
-		<description>Lightgun Game 2 in 1 - Cosmocop + Cyber Monster (Tw)</description>
+		<description>Lightgun Game 2 in 1 - Cosmocop + Cyber Monster (Taiwan)</description>
 		<year>1993</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-023"/>
@@ -55499,7 +55504,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="2tcstc">
-		<description>Lightgun Game 2 in 1 - Tough Cop + Super Tough Cop (Tw)</description>
+		<description>Lightgun Game 2 in 1 - Tough Cop + Super Tough Cop (Taiwan)</description>
 		<year>1993</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-024"/>
@@ -55517,7 +55522,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="tai16mj2">
-		<description>Taiwan Mahjong 2 (Tw)</description>
+		<description>Taiwan Mahjong 2 (Taiwan)</description>
 		<year>1992</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-025"/>
@@ -55536,7 +55541,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mjacad">
-		<description>Mahjong Academy (Tw)</description>
+		<description>Mahjong Academy (Taiwan)</description>
 		<year>1992</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-026"/>
@@ -55554,7 +55559,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mjcompana" cloneof="mjcompan">
-		<description>Mahjong Companion (Tw, Sachen)</description>
+		<description>Mahjong Companion (Taiwan, Sachen)</description>
 		<year>19??</year>
 		<publisher>Sachen</publisher>
 		<info name="serial" value="SA-027"/>
@@ -55571,7 +55576,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="chinkngf">
-		<description>Chinese KungFu (Tw)</description>
+		<description>Chinese KungFu (Taiwan)</description>
 		<year>19??</year>
 		<publisher>Sachen</publisher>
 		<part name="cart" interface="nes_cart">
@@ -56142,7 +56147,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="huangdi">
-		<description>Huang Di (Tw)</description>
+		<description>Huang Di (Taiwan)</description>
 		<year>199?</year>
 		<publisher>NTDEC</publisher>
 		<info name="serial" value="CN-29"/>
@@ -56218,7 +56223,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 <!-- Also verified on a Spanish cart by Gluk Video -->
 	<software name="creatom">
-		<description>Creatom (Tw, Spa)</description>
+		<description>Creatom (Spain, Taiwan)</description>
 		<year>199?</year>
 		<publisher>TXC Corp / Gluk Video</publisher>
 		<info name="serial" value="MGC-003"/>
@@ -56238,7 +56243,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<!-- From GoodNES -->
 	<software name="bingo">
-		<description>Bingo (Tw)</description>
+		<description>Bingo (Taiwan)</description>
 		<year>19??</year>
 		<publisher>Micro Genius</publisher>
 		<info name="serial" value="MGC-005"/>
@@ -56257,7 +56262,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mjblock">
-		<description>Mahjong Block (Tw)</description>
+		<description>Mahjong Block (Taiwan)</description>
 		<year>1991</year>
 		<publisher>Micro Genius</publisher>
 		<info name="serial" value="MGC-008"/>
@@ -56275,7 +56280,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<!-- there is also a version with removed protection and crcs a2d70c92 and 0689d618 -->
 	<software name="dumarac">
-		<description>1991 Du Ma Racing (Tw)</description>
+		<description>1991 Du Ma Racing (Taiwan)</description>
 		<year>1991</year>
 		<publisher>Super Mega</publisher>
 		<info name="serial" value="MGC-009"/>
@@ -56936,7 +56941,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="jdyx" cloneof="sdgndgs3" supported="no">
-		<description>Jue Dai Ying Xiong (Chi)</description>
+		<description>Jue Dai Ying Xiong (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="serial" value="ES-1022"/>
@@ -57273,7 +57278,8 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 		</part>
 	</software>
 
-	<software name="dquest4c" cloneof="dwarr">
+<!-- Game has no sound. Does this freeze up like the Japanese original? -->
+	<software name="dquest4c" cloneof="dwarr" supported="no">
 		<!-- Notes: AKA Dragon Quest IV -->
 		<description>Yong Zhe Dou E Long IV (China, decrypted)</description>
 		<year>19??</year>
@@ -58111,7 +58117,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="xiyouji">
-		<description>Xi You Ji Hou Zhuan (Chi)</description>
+		<description>Xi You Ji Hou Zhuan (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="serial" value="ES-1097"/>
@@ -58148,7 +58154,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="hywz">
-		<description>Huo Yan Wen Zhang - Sheng Zhan De Xi Pu (Chi)</description>
+		<description>Huo Yan Wen Zhang - Sheng Zhan De Xi Pu (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="serial" value="ES-1100"/>
@@ -58194,12 +58200,13 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 		</part>
 	</software>
 
-	<software name="dquest5" cloneof="dwarr2">
-		<description>Yong Zhe Dou E Long V (China, decrypted)</description>
+<!-- Game has no sound. Does this freeze up? -->
+	<software name="dquest5" cloneof="dwarr2" supported="no">
+		<description>Yǒngzhě Dòu Èlóng V (China, decrypted)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="serial" value="ES-1106"/>
-		<info name="alt_title" value="勇者斗恶龙Ⅴ"/>
+		<info name="alt_title" value="勇者斗悪龍Ⅴ"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="txrom" />
 			<feature name="pcb" value="NES-TLROM" />
@@ -59255,7 +59262,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mcwy">
-		<description>Mu Chang Wu Yu (Chi)</description>
+		<description>Mu Chang Wu Yu (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ011"/>
@@ -59278,7 +59285,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="cjjq">
-		<description>Chaoji Ji Qi Ren Da Zhan A (Chi)</description>
+		<description>Chaoji Ji Qi Ren Da Zhan A (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ012"/>
@@ -59301,7 +59308,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="hlb">
-		<description>Han Liu Bang (Chi)</description>
+		<description>Han Liu Bang (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ013"/>
@@ -59324,7 +59331,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="shengjcs">
-		<description>Sheng Jian Chuan Shuo (Chi)</description>
+		<description>Sheng Jian Chuan Shuo (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ014"/>
@@ -59349,7 +59356,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 <!-- [NJ015] 楚汉风云 ~ Chu Han Fengyun -->
 
 	<software name="tkhx">
-		<description>Tai Kong Huan Xiang (Chi)</description>
+		<description>Tai Kong Huan Xiang (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ016"/>
@@ -59372,7 +59379,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="xjqxz">
-		<description>Xian Jian Ji Xia Zhuan (Chi)</description>
+		<description>Xian Jian Ji Xia Zhuan (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ017"/>
@@ -59396,7 +59403,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<software name="sanguocz">
 		<!-- Notes: AKA Romance of the Three Kingdoms - The Legend of Cao Cao -->
-		<description>San Guo Zhi - CaoCao Zhuan (Chi)</description>
+		<description>San Guo Zhi - CaoCao Zhuan (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ018"/>
@@ -59420,7 +59427,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<software name="shssn">
 		<!-- Notes: port of the GBC game by Vast Fame -->
-		<description>Shui Hu Shen Shou (Chi, Nanjing)</description>
+		<description>Shui Hu Shen Shou (China, Nanjing)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ019"/>
@@ -59443,7 +59450,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="hjty">
-		<description>Huang Jin Tai Yang (Chi)</description>
+		<description>Huang Jin Tai Yang (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ020"/>
@@ -59466,7 +59473,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="dahuaxyn">
-		<description>Da Hua Xi You (Chi, Nanjing)</description>
+		<description>Da Hua Xi You (China, Nanjing)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ021"/>
@@ -59489,7 +59496,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="sseiyac">
-		<description>Saint Saiya - Tian Ma Huan Xiang (Chi)</description>
+		<description>Saint Saiya - Tian Ma Huan Xiang (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ022"/>
@@ -59541,7 +59548,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 <!-- [NJ027] 逐鹿三国 ~ Zhu Lu San Guo -->
 
 	<software name="shuihu3">
-		<description>Shui Hu 3 (Chi)</description>
+		<description>Shui Hu 3 (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ028"/>
@@ -59564,7 +59571,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="qgdz">
-		<description>Qi Guo Da Zhan (Chi)</description>
+		<description>Qi Guo Da Zhan (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ029"/>
@@ -59587,7 +59594,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="styx">
-		<description>Sui Tang Ying Xiong (Chi)</description>
+		<description>Sui Tang Ying Xiong (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ030"/>
@@ -59610,7 +59617,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="sjjs">
-		<description>Jin Yong Qun Xia Zhuan - Shu Jian Jiang Shan (Chi)</description>
+		<description>Jin Yong Qun Xia Zhuan - Shu Jian Jiang Shan (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ031"/>
@@ -59633,7 +59640,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="yugioh">
-		<description>Yu-Gi-Oh! (Chi)</description>
+		<description>Yu-Gi-Oh! (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ032"/>
@@ -59658,7 +59665,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 <!-- [NJ033] 真侍魂-武士道烈传 ~ Zhen Shi Hun - Wushidao Lie Chuan (Samurai Spirits - Bushido Retsuden) -->
 <!-- is this correct or is it a sequel of NJ033? and what is the relation with NJ042 below? they seem the same game... -->
 	<software name="ssamsho2a" cloneof="ssamsho2">
-		<description>Zhen Shi Hun - Wushidao Lie Zhuan (Chi)</description>
+		<description>Zhen Shi Hun - Wushidao Lie Zhuan (China)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<info name="serial" value="NJ033"/>
@@ -59683,7 +59690,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<software name="huanshil">
 		<!-- Notes: this is a backport from a PC game -->
-		<description>Huan Shi Lu (Chi)</description>
+		<description>Huan Shi Lu (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ034"/>
@@ -59706,7 +59713,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="tlbb">
-		<description>Tian Long Ba Bu (Chi)</description>
+		<description>Tian Long Ba Bu (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ035"/>
@@ -59729,7 +59736,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="nzcq">
-		<description>Ne Zha Chuan Qi (Chi)</description>
+		<description>Ne Zha Chuan Qi (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ036"/>
@@ -59752,7 +59759,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="diablo">
-		<description>Diablo (Chi)</description>
+		<description>Diablo (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ037"/>
@@ -59775,7 +59782,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="skzl">
-		<description>Shi Kong Zhi Lun - Chrono Trigger (Chi)</description>
+		<description>Shi Kong Zhi Lun - Chrono Trigger (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ038"/>
@@ -59798,7 +59805,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="hulujg">
-		<description>Hu Lu Jin Gang (Chi)</description>
+		<description>Hu Lu Jin Gang (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ039"/>
@@ -59821,7 +59828,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="sanguolv">
-		<description>San Guo Zhi - Lv Bu Zhuan (Chi)</description>
+		<description>San Guo Zhi - Lv Bu Zhuan (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ040"/>
@@ -59847,7 +59854,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 	<software name="zshhzlr">
 		<!-- Notes: Title screen hack of NJ033? -->
-		<description>Zhen Shi Hun - Hun Zhi Li Ren (Chi)</description>
+		<description>Zhen Shi Hun - Hun Zhi Li Ren (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ042"/>
@@ -59873,7 +59880,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 <!-- [NJ044] 剑侠情缘 ~ Jian Xia Qing Yuan -->
 
 	<software name="xuanyuan">
-		<description>Xuan Yuan Jian - Wai Zhuan Zhi Tian Zhi Hen (Chi)</description>
+		<description>Xuan Yuan Jian - Wai Zhuan Zhi Tian Zhi Hen (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ045"/>
@@ -59897,7 +59904,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 
 	<software name="ldhbkqcs">
-		<description>Lei Dian Huang Bi Ka Qiu Chuan Shuo (Chi)</description>
+		<description>Lei Dian Huang Bi Ka Qiu Chuan Shuo (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ046"/>
@@ -59920,7 +59927,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="sanguows" supported="partial">
-		<description>San Guo Wu Shuang - Meng Jiang Zhuan (Chi)</description>
+		<description>San Guo Wu Shuang - Meng Jiang Zhuan (China)</description>
 		<year>19??</year>
 		<publisher>Nanjing</publisher>
 		<info name="serial" value="NJ047"/>
@@ -61158,7 +61165,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="dahuaxyu">
-		<description>Da Hua Xi You (Chi, Union Bond)</description>
+		<description>Da Hua Xi You (China, Union Bond)</description>
 		<year>19??</year>
 		<publisher>Union Bond</publisher>
 		<info name="serial" value="G-0004"/>
@@ -61657,7 +61664,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 <!-- nointro -->
 	<software name="pukejing">
-		<description>Pu Ke Jing Ling (Chi)</description>
+		<description>Pu Ke Jing Ling (China)</description>
 		<!-- TOSEC title Mari, Ayami, Luka no AV Poker - Pu Nu Jing Ling, check if doubling the second rom we get  d6a102ed!! -->
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -61830,7 +61837,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="dzl" cloneof="daisenr">
-		<description>Dai Zhan Lue (Chi)</description>
+		<description>Dai Zhan Lue (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<part name="cart" interface="nes_cart">
@@ -61920,7 +61927,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="dbzgaidnc" cloneof="dbzgaidn">
-		<description>Dragon Ball Z Gaiden - Saiyajin Zetsumetsu Keikaku (Chi)</description>
+		<description>Dragon Ball Z Gaiden - Saiyajin Zetsumetsu Keikaku (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="serial" value="ES-1096?"/>
@@ -61945,7 +61952,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="dbz2c" cloneof="dbz2">
-		<description>Dragon Ball Z II - Gekishin Freeza!! (Chi)</description>
+		<description>Dragon Ball Z II - Gekishin Freeza!! (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="serial" value="ES-1094"/>
@@ -61970,7 +61977,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="dbz2ca" cloneof="dbz2">
-		<description>Ji Zhan Fu Li Sa Zhi Sun Wu Fan (Chi)</description>
+		<description>Ji Zhan Fu Li Sa Zhi Sun Wu Fan (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="serial" value="ES-1094"/>
@@ -62629,11 +62636,12 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 		</part>
 	</software>
 
-	<software name="dquest2c" cloneof="dwarr2">
-		<description>Yong Zhe Dou E Long II (China)</description>
+<!-- Game has no sound. Does this freeze up? -->
+	<software name="dquest2c" cloneof="dwarr2" supported="no">
+		<description>Yǒngzhě Dòu Èlóng II (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
-		<info name="alt_title" value="勇者斗恶龙Ⅱ"/>
+		<info name="alt_title" value="勇者斗悪龍Ⅱ"/>
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="txrom" />
 			<feature name="pcb" value="NES-TLROM" />
@@ -64501,7 +64509,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="mihunche" cloneof="bbcar">
-		<description>Mi Hun Che (Chi)</description>
+		<description>Mi Hun Che (China)</description>
 		<year>1988</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -64517,7 +64525,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="scche" cloneof="bbcar">
-		<description>Super Car (Chi)</description>  <!-- This is not the correct title! -->
+		<description>Super Car (China)</description>  <!-- This is not the correct title! -->
 		<year>1988</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -64583,7 +64591,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="blockfrc">
-		<description>Block Force (Asia, Ripped from Tetris Family 9 in 1?)</description>
+		<description>Block Force (Asia, ripped from Tetris Family 9 in 1?)</description>
 		<year>19??</year>
 		<publisher>Hwang Shinwei</publisher>
 		<part name="cart" interface="nes_cart">
@@ -65168,7 +65176,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="erzhanzj">
-		<description>Er Zhan Zhi Jing Dian Zhan Yi (Chi)</description>
+		<description>Er Zhan Zhi Jing Dian Zhan Yi (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="二战之经典战役"/>
@@ -65458,7 +65466,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 <!-- Other two games forming the whole F-646 HIGH K Power Sports 4-in-1 were identical to original releases, so went undumped apparently -->
 	<software name="goal5" cloneof="tecmowc">
-		<description>Goal 5 Soccer (Ripped from F-646 HIGH K Power Sports 4-in-1)</description>
+		<description>Goal 5 Soccer (ripped from F-646 HIGH K Power Sports 4-in-1)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -65506,7 +65514,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="hstar2" cloneof="f1hero2">
-		<description>High Way Star II (Ripped from F-646 HIGH K Power Sports 4-in-1)</description>
+		<description>High Way Star II (ripped from F-646 HIGH K Power Sports 4-in-1)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -65522,7 +65530,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="huoyansz">
-		<description>Huo Yan Shi Zhe (Chi)</description>
+		<description>Huo Yan Shi Zhe (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="火焰使者"/>
@@ -65560,7 +65568,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="2socdanc">
-		<description>Super 2 in 1 (Chi, hacked)</description>
+		<description>Super 2 in 1 (China, hacked)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -65974,7 +65982,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 
 <!-- nointro -->
 	<software name="mgfh" supported="no">
-		<description>Mei Guo Fu Hao - Super Rich (Chi)</description>
+		<description>Mei Guo Fu Hao - Super Rich (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="美国富豪"/>
@@ -66034,7 +66042,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="menghxj">
-		<description>Meng Huan Xian Jing (Chi)</description>
+		<description>Meng Huan Xian Jing (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="梦幻仙境"/>
@@ -66072,7 +66080,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="molizhan">
-		<description>Mo Li Zhan Shi (Chi)</description>
+		<description>Mo Li Zhan Shi (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="魔力战士"/>
@@ -66097,7 +66105,7 @@ It was also distributed in form of Famicom carts, whose checksums (according to
 Also available (in form of IPS patches from the dev) some hacks featuring alt. levels: Mondo21 hack, gg version & Meteor version
 We don't include these hacks because they were not burned into real carts nor sold! -->
 	<software name="mrsplash">
-		<description>Mr. Splash! (Jpn)</description>
+		<description>Mr. Splash! (Japan)</description>
 		<year>2007</year>
 		<publisher>Hiroshi "Polygon" Inukai</publisher>
 		<part name="cart" interface="nes_cart">
@@ -66162,7 +66170,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="pandawrl">
-		<description>Panda World (Asia, Ripped from multicart XB-F812)</description>
+		<description>Panda World (Asia, ripped from multicart XB-F812)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<info name="serial" value="Ripped from XB-F812 9-in-1 multicart"/>
@@ -66195,7 +66203,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="pokemon">
-		<description>Pocket Monster (Ripped from multicart, hacked)</description>
+		<description>Pocket Monster (ripped from multicart, hacked)</description>
 		<!-- TOSEC title: Pocket Monster (199x)(-)(As)[H2 Dr. Titus][P][Ripped From 23 in 1, Ines Title]. check -->
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -66327,7 +66335,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="quanba4">
-		<description>Quan Ba 4 Dai (Chi)</description>
+		<description>Quan Ba 4 Dai (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi?</publisher>
 		<info name="alt_title" value="拳霸四代"/>
@@ -66364,7 +66372,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="saieqxz">
-		<description>Sai Er Qi Xia Zhuan (Chi)</description>
+		<description>Sai Er Qi Xia Zhuan (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="塞外奇侠传"/>
@@ -66429,7 +66437,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="sanguo2h">
-		<description>San Guo Zhi II (Chi)</description>
+		<description>San Guo Zhi II (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="三国志II"/>
@@ -66471,7 +66479,7 @@ We don't include these hacks because they were not burned into real carts nor so
 
 <!-- nointro -->
 	<software name="shanggsj">
-		<description>Shang Gu Shen Jian (Chi)</description>
+		<description>Shang Gu Shen Jian (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="上古神剑"/>
@@ -66531,7 +66539,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="shenqbb">
-		<description>Shen Qi Bao Bei (Chi)</description>
+		<description>Shen Qi Bao Bei (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="神奇宝贝"/>
@@ -66552,7 +66560,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="shudu">
-		<description>Shudu (Chi, Ripped from 5 in 1 cart?)</description>
+		<description>Shudu (China, ripped from 5 in 1 cart?)</description>
 		<year>19??</year>
 		<publisher>Nice Code?</publisher>
 		<part name="cart" interface="nes_cart">
@@ -66570,7 +66578,7 @@ We don't include these hacks because they were not burned into real carts nor so
 
 <!-- nointro -->
 	<software name="shuqiyuz">
-		<description>Shu Qi Yu - Zhi Li Xiao Zhuan Yuan (Chi)</description>
+		<description>Shu Qi Yu - Zhi Li Xiao Zhuan Yuan (China)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -66590,7 +66598,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="shuqiyus">
-		<description>Shu Qi Yu - Shu Xue Xiao Zhuan Yuan (Chi)</description>
+		<description>Shu Qi Yu - Shu Xue Xiao Zhuan Yuan (China)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -66645,7 +66653,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="alpski" cloneof="skiing">
-		<description>Alps Skiing (Chi)</description>
+		<description>Alps Skiing (China)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -67082,7 +67090,7 @@ We don't include these hacks because they were not burned into real carts nor so
 
 <!-- nointro -->
 	<software name="wangzifu">
-		<description>Wang Zi Fu Chou Ji (Chi)</description>
+		<description>Wang Zi Fu Chou Ji (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="王子复仇记"/>
@@ -67162,7 +67170,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="wujiandf">
-		<description>Wu Jian Dao Feng Yun (Chi)</description>
+		<description>Wu Jian Dao Feng Yun (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="无间道风云"/>
@@ -67206,7 +67214,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="xplan" cloneof="contrafc">
-		<description>X-Plan (Asia, Ripped from multicart XB-F865)</description>
+		<description>X-Plan (Asia, ripped from multicart XB-F865)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -67222,7 +67230,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="xwar" cloneof="silkworm">
-		<description>X-War (Asia, Ripped from multicart)</description>
+		<description>X-War (Asia, ripped from multicart)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -67275,7 +67283,7 @@ We don't include these hacks because they were not burned into real carts nor so
 <!-- nointro -->
 <!-- How is this related to the Waixing title?? -->
 	<software name="xinghzs" cloneof="waixngzs">
-		<description>Xing He Zhan Shi (Chi)</description>
+		<description>Xing He Zhan Shi (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="星河战士"/>
@@ -67298,7 +67306,7 @@ We don't include these hacks because they were not burned into real carts nor so
 <!-- nointro -->
 <!-- How is this related to the Waixing title?? -->
 	<software name="xingjizb" cloneof="waixngzs" supported="partial">
-		<description>Xing Ji Zheng Ba (Chi)</description>
+		<description>Xing Ji Zheng Ba (China)</description>
 		<year>1996</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="星际争霸 (Starcraft?)"/>
@@ -67321,7 +67329,7 @@ We don't include these hacks because they were not burned into real carts nor so
 <!-- nointro -->
 <!-- How is this related to the Waixing title?? -->
 	<software name="xingzhan" cloneof="waixngz2">
-		<description>Xing Zhan Qing Yuan (Chi)</description>
+		<description>Xing Zhan Qing Yuan (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="星战情缘"/>
@@ -67343,7 +67351,7 @@ We don't include these hacks because they were not burned into real carts nor so
 
 <!-- nointro -->
 <!-- For some reason this won't run from a cold boot and needs to be soft reset once. Once running game has no sound (probably same issue as dquest, which it appears to be derived from). -->
-	<software name="yingxion" supported="no">
+	<software name="yingxion" cloneof="dwarr" supported="no">
 		<description>Yīngxióng Yuán Yìjīng Chuánqí (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
@@ -67365,7 +67373,7 @@ We don't include these hacks because they were not burned into real carts nor so
 
 <!-- nointro -->
 	<software name="youling" supported="partial">
-		<description>You Ling Xing Dong (Chi)</description>
+		<description>You Ling Xing Dong (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi</publisher>
 		<info name="alt_title" value="幽灵行动"/>
@@ -67389,7 +67397,7 @@ We don't include these hacks because they were not burned into real carts nor so
 	</software>
 
 	<software name="zhonghyx">
-		<description>Zhong Hua Ying Xiong (Chi)</description>
+		<description>Zhong Hua Ying Xiong (China)</description>
 		<year>19??</year>
 		<publisher>HengGedianzi?</publisher>
 		<info name="alt_title" value="中华英雄"/>
@@ -68316,7 +68324,7 @@ All musics were removed in this game.
 	</software>
 
 	<software name="lyxz">
-		<description>Lu Ye Xian Zong (Chi)</description>
+		<description>Lu Ye Xian Zong (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="alt_title" value="绿野仙踪"/>
@@ -68333,7 +68341,7 @@ All musics were removed in this game.
 	</software>
 
 	<software name="mofamen" supported="no">
-		<description>Mo Fa Men - Ying Xiong Wu Di (Chi)</description>
+		<description>Mo Fa Men - Ying Xiong Wu Di (China)</description>
 		<year>19??</year>
 		<publisher>Waixing</publisher>
 		<info name="alt_title" value="魔法门-英雄无敌 ~ mófǎ mén-yīngxióng wúdí (Heroes of Might &amp; Magic?)"/>
@@ -68350,7 +68358,7 @@ All musics were removed in this game.
 	</software>
 
 	<software name="mabumi" supported="partial">
-		<description>Ma Bu Mi Zhen &amp; Qu Wei Cheng Yu Wu (Chi)</description>
+		<description>Ma Bu Mi Zhen &amp; Qu Wei Cheng Yu Wu (China)</description>
 		<year>19??</year>
 		<publisher>Subor</publisher>
 		<part name="cart" interface="nes_cart">
@@ -73407,7 +73415,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="edu18">
-		<description>Education Games 18 in 1 (Chi)</description>
+		<description>Education Games 18 in 1 (China)</description>
 		<year>19??</year>
 		<publisher>&lt;pirate&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -73428,7 +73436,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="studygam">
-		<description>Study and Game 32 in 1 (Chi)</description>
+		<description>Study and Game 32 in 1 (China)</description>
 		<year>19??</year>
 		<publisher>&lt;pirate&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -73469,7 +73477,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="abm5" supported="partial">
-		<description>ABM Study Card V5.0 (Chi)</description>
+		<description>ABM Study Card V5.0 (China)</description>
 		<year>1995?</year>
 		<publisher>ABM</publisher>
 		<part name="cart" interface="nes_cart">
@@ -73511,7 +73519,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="beitf98">
-		<description>Bei TongFang Win 98 (Chi)</description>
+		<description>Bei TongFang Win 98 (China)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -73527,7 +73535,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="ghgc" supported="no">
-		<description>Gaau Hok Gwong Cheung (Chi)</description>
+		<description>Gaau Hok Gwong Cheung (China)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -73543,7 +73551,7 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
 	</software>
 
 	<software name="dongshen">
-		<description>Dong Sheng English Sound-Word Blaster (Chi)</description>
+		<description>Dong Sheng English Sound-Word Blaster (China)</description>
 		<year>19??</year>
 		<publisher>Dong Sheng</publisher>
 		<part name="cart" interface="nes_cart">
@@ -75386,7 +75394,7 @@ Other
 	</software>
 
 	<software name="angrybr2" cloneof="moaikun">
-		<description>Angry Birds 2 (Moai Kun pirate, Ripped from multicart)</description>
+		<description>Angry Birds 2 (Moai Kun pirate, ripped from multicart)</description>
 		<year>19??</year>
 		<publisher>&lt;pirate&gt;</publisher>
 		<info name="alt_title" value="愤怒的小鸟2"/>
@@ -75404,7 +75412,7 @@ Other
 	</software>
 
 	<software name="angrybr3">
-		<description>Angry Birds 3 (Chi)</description>
+		<description>Angry Birds 3 (China)</description>
 		<year>19??</year>
 		<publisher>&lt;pirate&gt;</publisher>
 		<info name="alt_title" value="愤怒的小鸟3"/>
@@ -76580,7 +76588,7 @@ Other
 	</software>
 
 	<software name="plantzom">
-		<description>Plants Vs. Zombies (Chi)</description>
+		<description>Plants Vs. Zombies (China)</description>
 		<year>19??</year>
 		<publisher>&lt;pirate&gt;</publisher>
 		<info name="alt_title" value="植物大战僵尸"/>
@@ -77475,7 +77483,7 @@ Other
 	</software>
 
 	<software name="scontra2" cloneof="probot">
-		<description>Super Contra II (Chi, Contra pirate)</description>
+		<description>Super Contra II (China, Contra pirate)</description>
 		<year>19??</year>
 		<publisher>Mars</publisher>
 		<info name="serial" value="G-135"/>
@@ -77511,7 +77519,7 @@ Other
 
 	<software name="93contra" cloneof="probot">
 		<!-- Alt. Title: Super Contra II (cart label?) -->
-		<description>'93 Chaoji Hun (Chi, Contra pirate)</description>
+		<description>'93 Chaoji Hun (China, Contra pirate)</description>
 		<year>1993</year>
 		<publisher>Yanshan RuanJian</publisher>
 		<info name="alt_title" value="93超级魂"/>
@@ -77561,7 +77569,7 @@ Other
 	</software>
 
 	<software name="scontra5" cloneof="gijoeaf">
-		<description>Super Contra 5 (Chi, G.I. Joe Atlantis Factor pirate)</description>
+		<description>Super Contra 5 (China, G.I. Joe Atlantis Factor pirate)</description>
 		<year>19??</year>
 		<publisher>&lt;pirate&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -77791,7 +77799,7 @@ Other
 	</software>
 
 	<software name="ustrike" cloneof="cobracom">
-		<description>Urban Strike (Cobra Command pirate, Ripped from multicart)</description>
+		<description>Urban Strike (Cobra Command pirate, ripped from multicart)</description>
 		<year>19??</year>
 		<publisher>&lt;pirate&gt;</publisher>
 		<info name="serial" value="Ripped from NG-011 4-in-1 cart"/>
@@ -79527,7 +79535,7 @@ be better to redump them properly. -->
 	</software>
 
 	<software name="ssamsho2" supported="partial">
-		<description>Shin Samurai Spirits 2 - Haoumaru Jigoku Hen (Chi)</description>
+		<description>Shin Samurai Spirits 2 - Haoumaru Jigoku Hen (China)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -79700,7 +79708,7 @@ be better to redump them properly. -->
 	</software>
 
 	<software name="sf5">
-		<description>Street Fighter V (Asia, 20 characters, Ripped from multicart?)</description>
+		<description>Street Fighter V (Asia, 20 characters, ripped from multicart?)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
@@ -87597,7 +87605,7 @@ that the real dumps might surface -->
 
 <!-- Romless cart for the RAM expansion + Disk System drive (drive ROM is included in the drive device) -->
 	<software name="disksys">
-		<description>Family Computer Disk System (Jpn)</description>
+		<description>Family Computer Disk System (Japan)</description>
 		<year>1986</year>
 		<publisher>Nintendo</publisher>
 		<info name="usage" value="This is only supported by Famicom"/>
diff --git a/hash/x1_flop.xml b/hash/x1_flop.xml
index bc823ddd1b6eb..8eff28fbd2da0 100644
--- a/hash/x1_flop.xml
+++ b/hash/x1_flop.xml
@@ -2923,7 +2923,7 @@ Plus, some games crash MAME at exit (e.g. some sorcer disks or some arcus disks)
 	</software>
 
 	<software name="tankent2">
-		<description>Tanken-tai 2 - Makyo Amazon no Okuchi ni Kogane Densetsu wo Mita!</description>
+		<description>Tankentai 2 - Makyou Amazon no Okuchi ni Ougon Densetsu o Mita!</description>
 		<year>1985</year>
 		<publisher>データウエスト (Data West)</publisher>
 		<!-- Turbo only -->
diff --git a/makefile b/makefile
index 5284168ab2124..b55d986e0230e 100644
--- a/makefile
+++ b/makefile
@@ -1569,7 +1569,7 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.245"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.246"' > $@
 	@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1579,7 +1579,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
 	@echo 'const char build_version[] = BARE_BUILD_VERSION "W (" BARE_VCS_REVISION ")";' >> $@
 else
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.245" > $@
+	@echo #define BARE_BUILD_VERSION "0.246" > $@
 	@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char bare_vcs_revision[]; >> $@