diff --git a/hash/neogeo.xml b/hash/neogeo.xml
index 21ff0633297..ccc1ad5a6f5 100644
--- a/hash/neogeo.xml
+++ b/hash/neogeo.xml
@@ -4785,7 +4785,7 @@ license:CC0
 	</software>
 
 	<software name="stakwindev" cloneof="stakwin" supported="no">
-		<description>Stakes Winner / Stakes Winner - GI Kinzen  Seiha e no Michi (early development board)</description>
+		<description>Stakes Winner / Stakes Winner - GI Kinzen Seiha e no Michi (early development board)</description>
 		<year>1995</year>
 		<publisher>Saurus</publisher>
 		<info name="alt_title" value="ステークスウィナー"/>
@@ -4806,7 +4806,7 @@ license:CC0
 				<rom name="v1.v1" offset="0x000000" size="0x080000" crc="ac590b85" sha1="47ff2ba9648b7145c29b534cd1f6839abb43bee2" />
 				<rom name="v2.v2" offset="0x080000" size="0x080000" crc="23ad8a91" sha1="da620c182fe9fc36421da73f2937e627d9a641bf" />
 				<rom name="v3.v3" offset="0x100000" size="0x080000" crc="e2d216b6" sha1="28b70e57a352ef6a08a5564f7756113a66e7dbb7" />
-				</dataarea>
+			</dataarea>
 			<dataarea name="sprites" size="0x800000">
 				<rom loadflag="load32_byte" name="c1.c1"   offset="0x000000" size="0x080000" crc="fb2f29d3" sha1="1f4cf27d7da1262bae28a8dd88c56d8a9324e982" />
 				<rom loadflag="load32_byte" name="c2.c2"   offset="0x000002" size="0x080000" crc="6108e6db" sha1="f4cdb5df29698f1ba362a227b82d43c3baaa8948" />
diff --git a/hash/nes.xml b/hash/nes.xml
index ae48f16b2c2..705609f41fe 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -17636,10 +17636,10 @@ license:CC0
 			<feature name="mirroring" value="vertical" />
 			<feature name="peripheral" value="konami_hypershot" />
 			<dataarea name="prg" size="32768">
-				<rom name="800jx1p" size="32768" crc="db9418e8" sha1="91023417168e05ea9b63696ccca34355fc53011c" offset="00000"  />
+				<rom name="800jx1p" size="32768" crc="db9418e8" sha1="91023417168e05ea9b63696ccca34355fc53011c" offset="00000" />
 			</dataarea>
 			<dataarea name="chr" size="16384">
-				<rom name="800jxc" size="16384" crc="ffc4eede" sha1="de7044078b3a11dac6dccfb43da8e50c5c880149" offset="00000"  />
+				<rom name="800jxc" size="16384" crc="ffc4eede" sha1="de7044078b3a11dac6dccfb43da8e50c5c880149" offset="00000" />
 			</dataarea>
 		</part>
 	</software>
@@ -24703,7 +24703,7 @@ license:CC0
 				<rom name="0.prg" size="262144" crc="6701a19f" sha1="42e473b6e6244d336524e08a396eb2d44697f3f5" offset="00000" />
 			</dataarea>
 			<dataarea name="chr" size="131072">
-				<rom name="0.chr" size="131072" crc="482e9eff" sha1="c2750a5a5f1fb87351cd78e2aacdfaf14d542151" offset="00000"  />
+				<rom name="0.chr" size="131072" crc="482e9eff" sha1="c2750a5a5f1fb87351cd78e2aacdfaf14d542151" offset="00000" />
 			</dataarea>
 			<!-- 8k WRAM on cartridge, battery backed up -->
 			<dataarea name="bwram" size="8192">
@@ -26213,7 +26213,7 @@ license:CC0
 			<feature name="pcb" value="TAITO-CNROM" />
 			<feature name="mirroring" value="vertical" />
 			<dataarea name="prg" size="32768">
-				<rom name="pp  pp x3-007" size="32768" crc="9ff0f634" sha1="d9c50e04d01c9d9c94460b71b449ff6c5c6c39d6" offset="00000" />
+				<rom name="pp pp x3-007" size="32768" crc="9ff0f634" sha1="d9c50e04d01c9d9c94460b71b449ff6c5c6c39d6" offset="00000" />
 			</dataarea>
 			<dataarea name="chr" size="32768">
 				<rom name="c c c c x3-008" size="32768" crc="23e2279e" sha1="63ba9ff2040654bf2fc2dca5521839170234cc32" offset="00000" />
@@ -41516,10 +41516,10 @@ license:CC0
 			<feature name="pcb" value="HVC-SLROM" />
 			<feature name="mmc1_type" value="MMC1B3" />
 			<dataarea name="prg" size="131072">
-				<rom name="alt-u6-0 prg" size="131072" crc="903e36ad" sha1="42e5b6bad7c433c95ffef94a144b6a4ed4f47ab1" offset="00000"  />
+				<rom name="alt-u6-0 prg" size="131072" crc="903e36ad" sha1="42e5b6bad7c433c95ffef94a144b6a4ed4f47ab1" offset="00000" />
 			</dataarea>
 			<dataarea name="chr" size="131072">
-				<rom name="alt-u6-0 chr" size="131072" crc="f52ec2ad" sha1="9e179507ac878e7362ccd03d369488105b8c1f40" offset="00000"  />
+				<rom name="alt-u6-0 chr" size="131072" crc="f52ec2ad" sha1="9e179507ac878e7362ccd03d369488105b8c1f40" offset="00000" />
 			</dataarea>
 		</part>
 	</software>
@@ -65406,7 +65406,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
 	</software>
 
 	<software name="gameinpp" supported="no">
-		<description>Gameinis  - PingPong (Asia)</description>
+		<description>Gameinis - PingPong (Asia)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="nes_cart">
diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml
index 3d1b0a32c64..e85fa214297 100644
--- a/hash/pc8801_flop.xml
+++ b/hash/pc8801_flop.xml
@@ -4563,7 +4563,7 @@ ExtractDisk  [04]"Disk 2          " -> "battle gorilla_04.d88"
 	<!-- Hangs at HARD. DOS loader -->
 	<!-- FDC stalls [tries to scan for missing CHRN=(00 00 01 06)] -->
 	<software name="bshashms1" cloneof="bshashms" supported="no">
-		<description>Bishoujo Shashinkan  - Moving School (alt?)</description>
+		<description>Bishoujo Shashinkan - Moving School (alt?)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<info name="alt_title" value="美少女写真館 -ムービング・スクール-"/>
@@ -5328,7 +5328,7 @@ ExtractDisk  [02]"ｹﾝｼﾞｬﾉﾕｲｺﾞﾝ B   " -> "Bokensha-tachi - K
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1" />
 			<dataarea name="flop" size="348848">
-				<rom name="burning point  (disk 1).d88" size="348848" crc="eec09f66" sha1="47f01ef6587857f11fbceae50aa776daf39873ca"/>
+				<rom name="burning point (disk 1).d88" size="348848" crc="eec09f66" sha1="47f01ef6587857f11fbceae50aa776daf39873ca"/>
 			</dataarea>
 		</part>
 
@@ -14080,7 +14080,7 @@ ExtractDisk  [04]"Data Disk    " -> "formula cms_04.d88"
 		<part name="flop2" interface="floppy_5_25">
 			<feature name="part_id" value="Data (Map)" />
 			<dataarea name="flop" size="415840">
-				<rom name="gokudo jintori (data  - map).d88" size="415840" crc="b3e5d6b9" sha1="ecc6115143032f8b5cdf6403529e1e7db072d15a"/>
+				<rom name="gokudo jintori (data - map).d88" size="415840" crc="b3e5d6b9" sha1="ecc6115143032f8b5cdf6403529e1e7db072d15a"/>
 			</dataarea>
 		</part>
 	</software>
@@ -32692,14 +32692,14 @@ ExtractDisk  [02]"A DISK          " -> "sorcerian music library_02.d88"
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Mephius" />
 			<dataarea name="flop" size="348832">
-				<rom name="star arthur densetsu i wakuse  mephius(patched works through the end) (mephius).d88" size="348832" crc="b56aba12" sha1="cb83839cc8fa3bff301c63c0f7e263d6f2e66c7e"/>
+				<rom name="star arthur densetsu i wakuse mephius(patched works through the end) (mephius).d88" size="348832" crc="b56aba12" sha1="cb83839cc8fa3bff301c63c0f7e263d6f2e66c7e"/>
 			</dataarea>
 		</part>
 
 		<part name="flop2" interface="floppy_5_25">
 			<feature name="part_id" value="User Disk" />
 			<dataarea name="flop" size="348848">
-				<rom name="star arthur densetsu i wakuse  mephius(patched works through the end) (user disk).d88" size="348848" crc="46131f10" sha1="c32cdf24341ca3ea61a5331abee38c6ff364b39d"/>
+				<rom name="star arthur densetsu i wakuse mephius(patched works through the end) (user disk).d88" size="348848" crc="46131f10" sha1="c32cdf24341ca3ea61a5331abee38c6ff364b39d"/>
 			</dataarea>
 		</part>
 	</software>
@@ -33215,7 +33215,7 @@ ExtractDisk  [02]"A DISK          " -> "sorcerian music library_02.d88"
 
 	<!-- [Incorrect layout on track 0 head 0, expected_size=100000, current_size=103616] -->
 	<software name="suiryus2" supported="no">
-		<description>Suiryushi II -  Wadatsumi no Hikari Koto</description>
+		<description>Suiryushi II - Wadatsumi no Hikari Koto</description>
 		<year>1989</year>
 		<publisher>しゃんばら (Shanbara)</publisher>
 		<!-- PC8801mk2SR -->
@@ -33262,7 +33262,7 @@ ExtractDisk  [02]"A DISK          " -> "sorcerian music library_02.d88"
 
 	<!-- [Incorrect layout on track 0 head 0, expected_size=100000, current_size=103616] -->
 	<software name="suiryus2a" cloneof="suiryus2" supported="no">
-		<description>Suiryushi II -  Wadatsumi no Hikari Koto (alt User Disk)</description>
+		<description>Suiryushi II - Wadatsumi no Hikari Koto (alt User Disk)</description>
 		<year>1989</year>
 		<publisher>しゃんばら (Shanbara)</publisher>
 		<!-- PC8801mk2SR -->
@@ -36352,7 +36352,7 @@ ExtractDisk  [02]"PROGRAM        " -> "transylvania_02.d88"
 	</software>
 
 	<software name="ultima3">
-		<description>Ultima III  - Exodus</description>
+		<description>Ultima III - Exodus</description>
 		<year>1989</year>
 		<publisher>ポニカ (Pony Canyon)</publisher>
 		<!-- PC8801mk2SR -->
@@ -36389,7 +36389,7 @@ ExtractDisk  [02]"ｼﾅﾘｵﾃﾞｨｽｸ      " -> "ultima 3(ponyca)_02.d88
 ExtractDisk  [03]"ﾕｰｻﾞｰｼｽﾃﾑﾃﾞｨｽｸ  " -> "ultima 3(ponyca)_03.d88"
 -->
 	<software name="ultima3a" cloneof="ultima3">
-		<description>Ultima III  - Exodus (alt)</description>
+		<description>Ultima III - Exodus (alt)</description>
 		<year>1989</year>
 		<publisher>ポニカ (Pony Canyon)</publisher>
 		<!-- PC8801mk2SR -->
@@ -36419,7 +36419,7 @@ ExtractDisk  [03]"ﾕｰｻﾞｰｼｽﾃﾑﾃﾞｨｽｸ  " -> "ultima 3(pon
 
 <!-- does this contain correct programs?? also flop2 & 3 seem equal except for header... -->
 	<software name="ultima3b" cloneof="ultima3">
-		<description>Ultima III  - Exodus (Bad?)</description>
+		<description>Ultima III - Exodus (Bad?)</description>
 		<year>1989</year>
 		<publisher>ポニカ (Pony Canyon)</publisher>
 		<!-- PC8801mk2SR -->
@@ -57138,7 +57138,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemda"  cloneof="filemst">
+	<software name="filemda" cloneof="filemst">
 		<description>The File Master - diskA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57149,7 +57149,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdb"  cloneof="filemst">
+	<software name="filemdb" cloneof="filemst">
 		<description>The File Master - diskB</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57160,7 +57160,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdc"  cloneof="filemst">
+	<software name="filemdc" cloneof="filemst">
 		<description>The File Master - diskC</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57171,7 +57171,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdd"  cloneof="filemst">
+	<software name="filemdd" cloneof="filemst">
 		<description>The File Master - diskD</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57182,7 +57182,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemde"  cloneof="filemst">
+	<software name="filemde" cloneof="filemst">
 		<description>The File Master - diskE</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57193,7 +57193,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdf"  cloneof="filemst">
+	<software name="filemdf" cloneof="filemst">
 		<description>The File Master - diskF</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57204,7 +57204,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdg"  cloneof="filemst">
+	<software name="filemdg" cloneof="filemst">
 		<description>The File Master - diskG</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57217,7 +57217,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 
 	<!-- Prints "THE FILE MASTER data disk" then hangs -->
 	<!-- FDC stalls [Never clears HALT state] -->
-	<software name="filemdh"  cloneof="filemst" supported="no">
+	<software name="filemdh" cloneof="filemst" supported="no">
 		<description>The File Master - diskH</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57228,7 +57228,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdi"  cloneof="filemst">
+	<software name="filemdi" cloneof="filemst">
 		<description>The File Master - diskI</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57239,7 +57239,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdj"  cloneof="filemst">
+	<software name="filemdj" cloneof="filemst">
 		<description>The File Master - diskJ</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57250,7 +57250,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdk"  cloneof="filemst">
+	<software name="filemdk" cloneof="filemst">
 		<description>The File Master - diskK</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57261,7 +57261,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdl"  cloneof="filemst">
+	<software name="filemdl" cloneof="filemst">
 		<description>The File Master - diskL</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57272,7 +57272,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemdm"  cloneof="filemst">
+	<software name="filemdm" cloneof="filemst">
 		<description>The File Master - diskM</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57283,7 +57283,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemnice"  cloneof="filemst">
+	<software name="filemnice" cloneof="filemst">
 		<description>The File Master NICE</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57294,7 +57294,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemp8b"  cloneof="filemst">
+	<software name="filemp8b" cloneof="filemst">
 		<description>The File Master P8B</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57305,7 +57305,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemp8n"  cloneof="filemst">
+	<software name="filemp8n" cloneof="filemst">
 		<description>The File Master P8N</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57316,7 +57316,7 @@ ExtractDisk  [03]"文章ﾃﾞｨｽｸ    " -> "super shunbo ii_03.d88"
 		</part>
 	</software>
 
-	<software name="filemsys"  cloneof="filemst">
+	<software name="filemsys" cloneof="filemst">
 		<description>The File Master System</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57345,7 +57345,7 @@ ExtractDisk  [12]"TFM_Parameter_7 " -> "the file master (ver1.1) & hot file expr
 ExtractDisk  [13]"TFM_Param_8_NEW " -> "the file master (ver1.1) & hot file express_13.d88" b3f914c5
 ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file express_14.d88"
 -->
-	<software name="filemsta"  cloneof="filemst">
+	<software name="filemsta" cloneof="filemst">
 		<description>The File Master v1.1 (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57357,7 +57357,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstoto"  cloneof="filemst">
+	<software name="filemstoto" cloneof="filemst">
 		<description>The File Master - Otokuyou</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57369,7 +57369,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstp3"  cloneof="filemst">
+	<software name="filemstp3" cloneof="filemst">
 		<description>The File Master - Parameter 3</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57380,7 +57380,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstp7"  cloneof="filemst">
+	<software name="filemstp7" cloneof="filemst">
 		<description>The File Master - Parameter 7</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57392,7 +57392,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 	</software>
 
 <!-- Alt version of P8N?? -->
-	<software name="filemstp8"  cloneof="filemst">
+	<software name="filemstp8" cloneof="filemst">
 		<description>The File Master - Parameter 8 New</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57414,7 +57414,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf01"  cloneof="filemst">
+	<software name="filemstf01" cloneof="filemst">
 		<description>The File Master 88 Filer 1</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57425,7 +57425,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf02"  cloneof="filemst">
+	<software name="filemstf02" cloneof="filemst">
 		<description>The File Master 88 Filer 2</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57436,7 +57436,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf03"  cloneof="filemst">
+	<software name="filemstf03" cloneof="filemst">
 		<description>The File Master 88 Filer 3</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57447,7 +57447,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf04"  cloneof="filemst">
+	<software name="filemstf04" cloneof="filemst">
 		<description>The File Master 88 Filer 4</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57458,7 +57458,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf05"  cloneof="filemst">
+	<software name="filemstf05" cloneof="filemst">
 		<description>The File Master 88 Filer 5</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57469,7 +57469,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf06"  cloneof="filemst">
+	<software name="filemstf06" cloneof="filemst">
 		<description>The File Master 88 Filer 6</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57480,7 +57480,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf07"  cloneof="filemst">
+	<software name="filemstf07" cloneof="filemst">
 		<description>The File Master 88 Filer 7</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57491,7 +57491,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf08"  cloneof="filemst">
+	<software name="filemstf08" cloneof="filemst">
 		<description>The File Master 88 Filer 8</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57502,7 +57502,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf09"  cloneof="filemst">
+	<software name="filemstf09" cloneof="filemst">
 		<description>The File Master 88 Filer 9</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57513,7 +57513,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf10"  cloneof="filemst">
+	<software name="filemstf10" cloneof="filemst">
 		<description>The File Master 88 Filer 10</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57524,7 +57524,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf11"  cloneof="filemst">
+	<software name="filemstf11" cloneof="filemst">
 		<description>The File Master 88 Filer 11</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57535,7 +57535,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
 		</part>
 	</software>
 
-	<software name="filemstf12"  cloneof="filemst">
+	<software name="filemstf12" cloneof="filemst">
 		<description>The File Master 88 Filer 12</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -57559,7 +57559,7 @@ ExtractDisk  [14]"TFM_NEW        " -> "the file master (ver1.1) & hot file expre
     </software>
  -->
 
-	<software name="filemstf14"  cloneof="filemst">
+	<software name="filemstf14" cloneof="filemst">
 		<description>The File Master 88 Filer 14</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
diff --git a/hash/pc98.xml b/hash/pc98.xml
index ab7a19a1ad2..5dbe7563a9b 100644
--- a/hash/pc98.xml
+++ b/hash/pc98.xml
@@ -3578,7 +3578,7 @@ TODO:
 	<software name="aggregat">
 		<description>Aggregate</description>
 		<year>1994</year>
-		<publisher>ジャパンホームビデオ  (Japan Home Video)</publisher>
+		<publisher>ジャパンホームビデオ (Japan Home Video)</publisher>
 		<info name="alt_title" value="アグレガード" />
 		<info name="release" value="19941021" />
 		<part name="flop1" interface="floppy_5_25">
@@ -14374,7 +14374,7 @@ TODO:
 		<!-- Origin: Neo Kobe Collection -->
 		<description>Desert Dragoon - Sabaku no Ryuukihei</description>
 		<year>1993</year>
-		<publisher>ジャパンホームビデオ  (Japan Home Video)</publisher>
+		<publisher>ジャパンホームビデオ (Japan Home Video)</publisher>
 		<info name="alt_title" value="デザートドラグーン ～砂漠の竜騎兵～" />
 		<info name="release" value="19930709" />
 		<info name="usage" value="Has manual copy protection" />
@@ -17452,7 +17452,7 @@ TODO:
 	<software name="duel" supported="partial">
 		<description>Duel</description>
 		<year>1990</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="デュエル" />
 		<info name="release" value="19900512" />
 		<part name="flop1" interface="floppy_5_25">
@@ -17479,7 +17479,7 @@ TODO:
 		<!-- Origin: Neo Kobe Collection -->
 		<description>Duel - Kawanakajima Scenario</description>
 		<year>1991</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="デュエル 川中島シナリオ" />
 		<info name="release" value="19910720" />
 		<info name="usage" value="Expansion disk for Duel. Boot from the original Duel opening disk, then switch to the character/map disks from this set when prompted" />
@@ -17501,7 +17501,7 @@ TODO:
 		<!-- Origin: Neo Kobe Collection -->
 		<description>Duel Succession</description>
 		<year>1996</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="デュエル・サクセション" />
 		<info name="release" value="19960323" />
 		<info name="usage" value="Requires HDD installation. Run DSINST.EXE from DOS." />
@@ -19979,7 +19979,7 @@ TODO:
 	<software name="fqueen">
 		<description>First Queen</description>
 		<year>1988</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="ファーストクィーン" />
 		<info name="release" value="198812xx" />
 		<part name="flop1" interface="floppy_5_25">
@@ -19999,7 +19999,7 @@ TODO:
 	<software name="fqueena" cloneof="fqueen">
 		<description>First Queen (Alt)</description>
 		<year>1988</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="ファーストクィーン" />
 		<info name="release" value="198812xx" />
 		<part name="flop1" interface="floppy_5_25">
@@ -20019,7 +20019,7 @@ TODO:
 	<software name="fqueen2">
 		<description>First Queen II - Sabaku no Joou</description>
 		<year>1990</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="ファーストクィーン２ 砂漠の女王" />
 		<info name="release" value="19901217" />
 		<part name="flop1" interface="floppy_5_25">
@@ -20045,7 +20045,7 @@ TODO:
 	<software name="fqueen3">
 		<description>First Queen III</description>
 		<year>1993</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="ファーストクィーン３" />
 		<info name="release" value="19930702" />
 		<part name="flop1" interface="floppy_5_25">
@@ -20071,7 +20071,7 @@ TODO:
 	<software name="fqueen4">
 		<description>First Queen IV - Varcia Senki</description>
 		<year>1994</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="ファーストクィーン４ バルシア戦記" />
 		<info name="release" value="19940610" />
 		<part name="flop1" interface="floppy_5_25">
@@ -23576,7 +23576,7 @@ TODO:
 	<software name="headqrt" supported="no">
 		<description>Headquarters - America no Akumu</description>
 		<year>1994</year>
-		<publisher>アルゴラボ  算法研究所 (Algolab)</publisher>
+		<publisher>アルゴラボ 算法研究所 (Algolab)</publisher>
 		<info name="alt_title" value="ヘッドクォーターズ アメリカの悪夢" />
 		<info name="release" value="19940520" />
 		<part name="flop1" interface="floppy_5_25">
@@ -41168,7 +41168,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?)
 	<software name="sotsugyo">
 		<description>Sotsugyou - Graduation</description>
 		<year>1992</year>
-		<publisher>ジャパンホームビデオ  (Japan Home Video)</publisher>
+		<publisher>ジャパンホームビデオ (Japan Home Video)</publisher>
 		<info name="alt_title" value="卒業 －グラデュエーション－" />
 		<info name="release" value="19920625" />
 		<part name="flop1" interface="floppy_5_25">
@@ -42171,13 +42171,13 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?)
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1265664">
-				<rom name="surper  pink sox 3+ (1994)(wendy magazine) disk_a.fdi" size="1265664" crc="590de4c5" sha1="c0d91c756bf09510e3b61e94bb4da2abf865238b" offset="0" />
+				<rom name="surper pink sox 3+ (1994)(wendy magazine) disk_a.fdi" size="1265664" crc="590de4c5" sha1="c0d91c756bf09510e3b61e94bb4da2abf865238b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<feature name="part_id" value="Disk B"/>
 			<dataarea name="flop" size="1265664">
-				<rom name="surper  pink sox 3+ (1994)(wendy magazine) disk_b.fdi" size="1265664" crc="9686f731" sha1="56abecf83a4101c4993166320cadd3c08ef55f8c" offset="0" />
+				<rom name="surper pink sox 3+ (1994)(wendy magazine) disk_b.fdi" size="1265664" crc="9686f731" sha1="56abecf83a4101c4993166320cadd3c08ef55f8c" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -52276,7 +52276,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?)
 	<software name="kawanaka" supported="no">
 		<description>Kawanakajima Ibunroku</description>
 		<year>1992</year>
-		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<publisher>呉ソフトウエア工房 (KSK)</publisher>
 		<info name="alt_title" value="川中島異聞録" />
 		<info name="release" value="19920327" />
 		<part name="flop1" interface="floppy_5_25">
@@ -52727,7 +52727,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?)
 	<software name="localba" supported="yes">
 		<description>Locus Alba</description>
 		<year>1995</year>
-		<publisher>アルゴラボ  算法研究所 (Algolab)</publisher>
+		<publisher>アルゴラボ 算法研究所 (Algolab)</publisher>
 		<info name="alt_title" value="ロクス・アルバ" />
 		<info name="release" value="19950421" />
 		<info name="usage" value="Needs a DOS install from HDD, run LAINST.BAT" />
@@ -52754,7 +52754,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?)
 	<software name="localbag" supported="no">
 		<description>Locus Alba Gaiden</description>
 		<year>1995</year>
-		<publisher>アルゴラボ  算法研究所 (Algolab)</publisher>
+		<publisher>アルゴラボ 算法研究所 (Algolab)</publisher>
 		<info name="alt_title" value="ロクス・アルバ外伝" />
 		<info name="release" value="19960126" />
 		<part name="flop1" interface="floppy_5_25">
@@ -69531,7 +69531,7 @@ Same as Police Quest 2 - Quest for Glory stand-alone disks
 		<publisher>コンパイル (Compile)</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1281968">
-				<rom name="geo conflict 2  the new demonbusters.d88" size="1281968" crc="bfdd5f8f" sha1="0b7051fdbba985a34f0c2e6a975b5f6bbf8c45e3" offset="0" />
+				<rom name="geo conflict 2 the new demonbusters.d88" size="1281968" crc="bfdd5f8f" sha1="0b7051fdbba985a34f0c2e6a975b5f6bbf8c45e3" offset="0" />
 			</dataarea>
 		</part>
 	</software>
diff --git a/hash/r9751.xml b/hash/r9751.xml
index 081f9343261..ac8ca1cba3a 100644
--- a/hash/r9751.xml
+++ b/hash/r9751.xml
@@ -53,7 +53,7 @@ license:CC0
 			<feature name="part_id" value="Disk 3" />
 			<dataarea name="flop" size="1474560">
 				<rom name="Siemens.9751.CBX.Release.9005.6.84.Disk3.img" size="1474560" crc="2c0226e2" sha1="08fca05de78e6325881deb3f062235a7bcc4ea10"/>
-				</dataarea>
+			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 4" />
diff --git a/hash/snes.xml b/hash/snes.xml
index 987661f9dd7..f57382dfc41 100644
--- a/hash/snes.xml
+++ b/hash/snes.xml
@@ -3566,15 +3566,15 @@ Beyond that last category are the roms waiting to be classified.
 		<part name="cart" interface="snes_cart">
 			<feature name="enhancement" value="GSU-2" />
 			<feature name="pcb" value="SHVC-4RB3B7S-RE-01" />
-			<feature name="u1"  value="U1 16M ROM-EMU" />
-			<feature name="u2"  value="U2 ?M EPROM" />
-			<feature name="u3"  value="U3 4M EPROM" />
-			<feature name="u4"  value="U4 4M EPROM" />
-			<feature name="u5"  value="U5 1M SRAM" />
-			<feature name="u6"  value="U6 64K SRAM" />
-			<feature name="u7"  value="U7 GSU-2 112P" />
-			<feature name="u8"  value="U8 ALS541" />
-			<feature name="u9"  value="U9 ALS541" />
+			<feature name="u1" value="U1 16M ROM-EMU" />
+			<feature name="u2" value="U2 ?M EPROM" />
+			<feature name="u3" value="U3 4M EPROM" />
+			<feature name="u4" value="U4 4M EPROM" />
+			<feature name="u5" value="U5 1M SRAM" />
+			<feature name="u6" value="U6 64K SRAM" />
+			<feature name="u7" value="U7 GSU-2 112P" />
+			<feature name="u8" value="U8 ALS541" />
+			<feature name="u9" value="U9 ALS541" />
 			<feature name="u10" value="U10 ALS1244" />
 			<feature name="u11" value="U11 LS139" />
 			<feature name="u12" value="U12 MM1134" />
@@ -5842,7 +5842,7 @@ more investigation needed...
 		<part name="cart" interface="snes_cart">
 			<feature name="slot" value="lorom" />
 			<dataarea name="rom" size="1048576">
-				<rom name="sm choukyoushi hitomi vol. 3 (japan) (alt 1) (unl) [b].sfc" size="1048576" crc="92e6d22f" sha1="cfed5026f490dcd3a9848c5499d4f6f010bab880" offset="0x000000"  status="baddump" />
+				<rom name="sm choukyoushi hitomi vol. 3 (japan) (alt 1) (unl) [b].sfc" size="1048576" crc="92e6d22f" sha1="cfed5026f490dcd3a9848c5499d4f6f010bab880" offset="0x000000" status="baddump" />
 			</dataarea>
 			<dataarea name="nvram" size="2048">
 			</dataarea>