diff --git a/hash/cpc_cass.xml b/hash/cpc_cass.xml
index 92175a59966..7c2d9fd753b 100644
--- a/hash/cpc_cass.xml
+++ b/hash/cpc_cass.xml
@@ -450,7 +450,8 @@ Please stick to using the floppy versions for the time being...
 		<year>1985</year>
 		<publisher>Amsoft</publisher>
 		<info name="usage" value="Load with |TAPE and then RUN&quot;&quot;" />
-		<info name="alt_title" value="3D Boxkampf" />       <part name="cass1" interface="cpc_cass">
+		<info name="alt_title" value="3D Boxkampf" />
+		<part name="cass1" interface="cpc_cass">
 			<dataarea name="cass" size="58470">
 				<rom name="3d boxing (uk) (1985) [original] [tape].cdt" size="58470" crc="19182316" sha1="adc783a37568ae81fcaa3c7a0af80b08258c038c"/>
 			</dataarea>
diff --git a/hash/dc.xml b/hash/dc.xml
index b5a04d997f1..45ef8f5c8ad 100644
--- a/hash/dc.xml
+++ b/hash/dc.xml
@@ -23413,8 +23413,7 @@ P830-****-** : Appears to be a Sega part number for promo discs.
 	Eventually requires emulated Maple DMA "swap endian" mode (SB_MMSEL register = 0).
 	-->
 
-	<!-- <software name="chkrepair205r" cloneof="chkrepair216r"> -->
-	<software name="chkrepair205r" supported="no">
+	<software name="chkrepair205r" supported="no"> <!-- cloneof="chkrepair216r"> -->
 		<description>DC Checker for Repair v2.05R (World)</description>
 		<year>1999</year>
 		<publisher>Sega</publisher>
diff --git a/hash/gamegear.xml b/hash/gamegear.xml
index 2282216cdbd..7ebe4013328 100644
--- a/hash/gamegear.xml
+++ b/hash/gamegear.xml
@@ -247,7 +247,7 @@ Hung Tao Hsin games are possibly pirate bootlegs though they may be officially l
 		</part>
 	</software>
 
-	<software name="aladdinp3" cloneof="aladdin">
+	<software name="aladdinp4" cloneof="aladdin">
 		<description>Disney's Aladdin (prototype, 19931229)</description>
 		<year>1993</year>
 		<publisher>Sega</publisher>
@@ -258,7 +258,7 @@ Hung Tao Hsin games are possibly pirate bootlegs though they may be officially l
 		</part>
 	</software>
 
-	<software name="aladdinp2" cloneof="aladdin">
+	<software name="aladdinp3" cloneof="aladdin">
 		<description>Disney's Aladdin (prototype, 19940111)</description>
 		<year>1994</year>
 		<publisher>Sega</publisher>
@@ -269,7 +269,7 @@ Hung Tao Hsin games are possibly pirate bootlegs though they may be officially l
 		</part>
 	</software>
 
-	<software name="aladdinp1" cloneof="aladdin">
+	<software name="aladdinp2" cloneof="aladdin">
 		<description>Disney's Aladdin (prototype, 19940113)</description>
 		<year>1994</year>
 		<publisher>Sega</publisher>
@@ -280,17 +280,16 @@ Hung Tao Hsin games are possibly pirate bootlegs though they may be officially l
 		</part>
 	</software>
 
-	<!-- same as jan 13 proto. was a mistake by drx? -->
-	<!--software name="aladdinp1a" cloneof="aladdin">
-	    <description>Disney's Aladdin (prototype WITH, 19940123)</description>
-	    <year>1994</year>
-	    <publisher>Sega</publisher>
-	    <part name="cart" interface="gamegear_cart">
-	        <dataarea name="rom" size="524288">
-	            <rom name="aladdin (prototype with - jan 23,  1994).bin" size="524288" crc="75a7f142" sha1="a968ee77938233a4ff94c73266c7fb36fa25657d"/>
-	        </dataarea>
-	    </part>
-	</software-->
+	<software name="aladdinp1" cloneof="aladdin">
+		<description>Disney's Aladdin (prototype, 19940124)</description>
+		<year>1994</year>
+		<publisher>Sega</publisher>
+		<part name="cart" interface="gamegear_cart">
+			<dataarea name="rom" size="524288">
+				<rom name="aladdin (prototype with - jan 24,  1994).bin" size="524288" crc="7a41c1dc" sha1="20ba7f5e5c801fbe48a537d2551a3d4525eb63e7"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="alexkidd">
 		<description>Alex Kidd in Miracle World (Tw, SMS mode)</description>
@@ -1148,18 +1147,6 @@ a certain item) -->
 		</part>
 	</software>
 
-	<!-- same as dec 11 proto. was a mistake by drx? -->
-	<!-- software name="bonkersp02a" cloneof="bonkers">
-	    <description>Disney's Bonkers Wax Up! (prototype, 19941212-B)</description>
-	    <year>1994</year>
-	    <publisher>Sega</publisher>
-	    <part name="cart" interface="gamegear_cart">
-	        <dataarea name="rom" size="524288">
-	            <rom name="bonkers wax up (prototype - dec 12,  1994 - b).bin" size="524288" crc="9a405d0d" sha1="e797640e2363f517fb83ee42903f5d13a1ffad73"/>
-	        </dataarea>
-	    </part>
-	</software-->
-
 	<software name="bonkersp01" cloneof="bonkers">
 		<description>Disney's Bonkers Wax Up! (prototype, 19941212-D)</description>
 		<year>1994</year>
@@ -4354,18 +4341,6 @@ a certain item) -->
 		</part>
 	</software>
 
-	<!-- same as aug 14 proto. was a mistake by drx? -->
-	<!--software name="lionkingp5b" cloneof="lionking">
-	    <description>Disney's The Lion King (prototype, 19940815)</description>
-	    <year>1994</year>
-	    <publisher>Virgin Interactive</publisher>
-	    <part name="cart" interface="gamegear_cart">
-	        <dataarea name="rom" size="514486">
-	            <rom name="lion king, the (prototype - aug 15,  1994).bin" size="514486" crc="eb10a2d4" sha1="cdce953f16e4db6e9137ea8d523588b3469a544d"/>
-	        </dataarea>
-	    </part>
-	</software-->
-
 	<software name="lionkingp4" cloneof="lionking">
 		<description>Disney's The Lion King (prototype, 19940816)</description>
 		<year>1994</year>
@@ -5574,18 +5549,6 @@ a certain item) -->
 		</part>
 	</software>
 
-	<!-- same as aug 25 proto. was a mistake by drx? -->
-	<!--software name="nfl95p11a" cloneof="nfl95">
-	    <description>NFL '95 (prototype, 19940825-B)</description>
-	    <year>1994</year>
-	    <publisher>Sega</publisher>
-	    <part name="cart" interface="gamegear_cart">
-	        <dataarea name="rom" size="524288">
-	            <rom name="nfl '95 (prototype - aug 25,  1994 - b).bin" size="524288" crc="fe140eaa" sha1="b79af203bc01ea1c59563e34105cb36cad158cca"/>
-	        </dataarea>
-	    </part>
-	</software-->
-
 	<software name="nfl95p11" cloneof="nfl95">
 		<description>NFL '95 (prototype, 19940825)</description>
 		<year>1994</year>
@@ -9481,18 +9444,6 @@ a certain item) -->
 		</part>
 	</software>
 
-	<!-- same as aug 14 proto. was a mistake by drx? -->
-	<!--software name="tazmarsp11a" cloneof="tazmars">
-	    <description>Taz in Escape from Mars (prototype, 19940815)</description>
-	    <year>1994</year>
-	    <publisher>Sega</publisher>
-	    <part name="cart" interface="gamegear_cart">
-	        <dataarea name="rom" size="524288">
-	            <rom name="taz in escape from mars (prototype - aug 15,  1994).bin" size="524288" crc="9267d968" sha1="8800da06ea2aa3982cf2e294b165f5e1a9cab63c"/>
-	        </dataarea>
-	    </part>
-	</software-->
-
 	<software name="tazmarsp10" cloneof="tazmars">
 		<description>Taz in Escape from Mars (prototype, 19940819)</description>
 		<year>1994</year>
@@ -10385,18 +10336,6 @@ a certain item) -->
 		</part>
 	</software>
 
-	<!-- same as aug 10 proto. was a mistake by drx? -->
-	<!--software name="xmenglp3a" cloneof="xmengl">
-	    <description>X-Men - Gamemaster's Legacy (prototype, 19940815)</description>
-	    <year>1994</year>
-	    <publisher>Sega</publisher>
-	    <part name="cart" interface="gamegear_cart">
-	        <dataarea name="rom" size="524288">
-	            <rom name="x-men - gamemaster's legacy (prototype - aug 15,  1994).bin" size="524288" crc="66cc4034" sha1="46237cf1c2810a8f2e5c31907a1ae04b647256c8"/>
-	        </dataarea>
-	    </part>
-	</software-->
-
 	<software name="xmenglp2" cloneof="xmengl">
 		<description>X-Men - Gamemaster's Legacy (prototype 36, 19940831)</description>
 		<year>1994</year>