diff --git a/hash/bbcb_flop_orig.xml b/hash/bbcb_flop_orig.xml
index 37eb2c4b212..9e76d7adda6 100644
--- a/hash/bbcb_flop_orig.xml
+++ b/hash/bbcb_flop_orig.xml
@@ -268,7 +268,7 @@
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Data"/>
+			<feature name="part_id" value="Database"/>
 			<dataarea name="flop" size="105079">
 				<rom name="033 acheton data.fsd" size="105079" crc="86fdca91" sha1="57f448a17868f0bdbbc6a415464220da0c418f72" offset="0" />
 			</dataarea>
@@ -636,7 +636,7 @@
 
 	<software name="omegaorb">
 		<description>Omega Orb</description>
-		<year>1986</year>
+		<year>1987</year>
 		<publisher>Audiogenic</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="104939">
@@ -815,7 +815,7 @@
 
 	<software name="sphdest">
 		<description>Sphere of Destiny</description>
-		<year>1986</year>
+		<year>1987</year>
 		<publisher>Audiogenic</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="105084">
@@ -825,17 +825,17 @@
 	</software>
 
 	<software name="colos4ch">
-		<description>Colossus 4 Chess</description>
-		<year>1988</year>
+		<description>Colossus Chess 4</description>
+		<year>1986</year>
 		<publisher>CDS</publisher>
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Side 1"/>
+			<feature name="part_id" value="Game &amp; Files G31-G34/G100-G118"/>
 			<dataarea name="flop" size="104953">
 				<rom name="000 colossus chess 4 side 1.fsd" size="104953" crc="c759e652" sha1="04a92c17cfec2827b4c6e85e4a271831346c9d00" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Side 2"/>
+			<feature name="part_id" value="Files G0-G30"/>
 			<dataarea name="flop" size="104953">
 				<rom name="000 colossus chess 4 side 2.fsd" size="104953" crc="2eda7e43" sha1="2b25c2d66c2d9ab40a90710ea931e01471b7a5d6" offset="0" />
 			</dataarea>
@@ -1107,8 +1107,8 @@
 	</software>
 
 	<software name="yiear">
-		<description>Yie Ar Kung Fu</description>
-		<year>1984</year>
+		<description>Yie Ar Kung-Fu</description>
+		<year>1985</year>
 		<publisher>Imagine</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="105081">
@@ -1460,7 +1460,7 @@
 
 	<software name="phancomb">
 		<description>Phantom Combat (BBC Series)</description>
-		<year>1985</year>
+		<year>1987</year>
 		<publisher>Doctor Soft</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="104944">
@@ -1532,7 +1532,7 @@
 	</software>
 
 	<software name="wediag">
-		<description>Diagnostics Disc</description>
+		<description>WE Diagnostics Utility Disc</description>
 		<year>1985</year>
 		<publisher>Watford Electronics</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -1609,9 +1609,9 @@
 	</software>
 
 	<software name="tcrosswd">
-		<description>The Times Crosswords Vol.1</description>
+		<description>The Times Computer Crosswords Vol.1</description>
 		<year>1988</year>
-		<publisher>The Times</publisher>
+		<publisher>Akom Limited</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side 1"/>
 			<dataarea name="flop" size="209879">
@@ -1988,7 +1988,7 @@
 
 	<software name="hobbit">
 		<description>The Hobbit</description>
-		<year>1983</year>
+		<year>1985</year>
 		<publisher>Melbourne House</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side 1"/>
@@ -2346,7 +2346,7 @@
 
 	<software name="nevryon">
 		<description>Nevyron</description>
-		<year>1991</year>
+		<year>1990</year>
 		<publisher>4th Dimension</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="104937">
@@ -2478,7 +2478,7 @@
 
 	<software name="holedoc1">
 		<description>Holed Out Extra Courses Vol.1</description>
-		<year>1990</year>
+		<year>1989</year>
 		<publisher>4th Dimension</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="104959">
@@ -2489,7 +2489,7 @@
 
 	<software name="holedoc2">
 		<description>Holed Out Extra Courses Vol.2</description>
-		<year>1990</year>
+		<year>1989</year>
 		<publisher>4th Dimension</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="104959">
@@ -3036,7 +3036,7 @@
 
 	<software name="ravskull">
 		<description>Ravenskull</description>
-		<year>1987</year>
+		<year>1986</year>
 		<publisher>Superior Software/Acornsoft</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="104940">
@@ -4040,7 +4040,7 @@
 
 	<software name="teachcup">
 		<description>The Teachers Cupboard</description>
-		<year>198?</year>
+		<year>1988</year>
 		<publisher>Sherston Software</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="The Apple"/>
@@ -4257,7 +4257,7 @@
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Punch + Judy-Rockpools"/>
+			<feature name="part_id" value="Punch &amp; Judy/Rockpools"/>
 			<dataarea name="flop" size="105052">
 				<rom name="290 toby at the beach punch + judy-rockpools (80 track).fsd" size="105052" crc="1becee05" sha1="9e6459a380a56bff5e682f40c82ca3019c43d721" offset="0" />
 			</dataarea>
@@ -4355,7 +4355,7 @@
 
 	<software name="aninumbr">
 		<description>Animated Numbers</description>
-		<year>198?</year>
+		<year>1990</year>
 		<publisher>Sherston Software</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="104946">
diff --git a/hash/bbcm_cass.xml b/hash/bbcm_cass.xml
index 67b5cfc2992..45fb8fc5476 100644
--- a/hash/bbcm_cass.xml
+++ b/hash/bbcm_cass.xml
@@ -50,7 +50,7 @@
 	</software>
 
 	<software name="strykrun">
-		<description>Strykers Run</description>
+		<description>Stryker's Run</description>
 		<year>1986</year>
 		<publisher>Superior Software</publisher>
 		<part name="cass" interface="bbc_cass">
diff --git a/hash/electron_cass.xml b/hash/electron_cass.xml
index 82dd4236d26..da3d9d2cb04 100644
--- a/hash/electron_cass.xml
+++ b/hash/electron_cass.xml
@@ -340,7 +340,7 @@
 		<publisher>Micro Power</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="8515">
-				<rom name="adventure-Micro Power_e.uef" size="8515" crc="8eabc302" sha1="3073bb57401655b711c679f93ab10fcac037f3f4" offset="0"/>
+				<rom name="adventure-micropower_e.uef" size="8515" crc="8eabc302" sha1="3073bb57401655b711c679f93ab10fcac037f3f4" offset="0"/>
 			</dataarea>
 		</part>
 	</software>
@@ -1302,7 +1302,7 @@
 
 	<software name="cascad50">
 		<description>Cascade 50</description>
-		<year>1984</year>
+		<year>1983</year>
 		<publisher>Cascade</publisher>
 		<part name="cass1" interface="electron_cass">
 			<feature name="part_id" value="Side 1"/>
@@ -1462,11 +1462,11 @@
 
 	<software name="chessmp">
 		<description>Chess (Micro Power)</description>
-		<year>1984</year>
+		<year>1983</year>
 		<publisher>Micro Power</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="5959">
-				<rom name="chess-Micro Power_e.uef" size="5959" crc="fa4b456e" sha1="34f86f5d22888c38e2d3bacba9b5845b89a31529" offset="0"/>
+				<rom name="chess-micropower_e.uef" size="5959" crc="fa4b456e" sha1="34f86f5d22888c38e2d3bacba9b5845b89a31529" offset="0"/>
 			</dataarea>
 		</part>
 	</software>
@@ -1484,7 +1484,7 @@
 
 	<software name="chipbust">
 		<description>Chip Buster</description>
-		<year>198?</year>
+		<year>1985</year>
 		<publisher>Software Invasion</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="12848">
@@ -1628,7 +1628,7 @@
 
 	<software name="colos4ch">
 		<description>Colossus Chess 4</description>
-		<year>1988</year>
+		<year>1986</year>
 		<publisher>CDS</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="15702">
@@ -1689,7 +1689,7 @@
 	</software>
 
 	<software name="commandopias" cloneof="commando">
-		<description>Commando (Play It Again Sam-3)</description>
+		<description>Commando (Play It Again Sam 3)</description>
 		<year>1989</year>
 		<publisher>Superior Software/Acornsoft</publisher>
 		<part name="cass" interface="electron_cass">
@@ -2029,7 +2029,7 @@
 
 	<software name="dddenis">
 		<description>Dare Devil Dennis</description>
-		<year>1984</year>
+		<year>1983</year>
 		<publisher>Visions</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="7441">
@@ -3348,7 +3348,7 @@
 
 	<software name="elites" cloneof="elite">
 		<description>Elite (Superior Software)</description>
-		<year>198?</year>
+		<year>1986</year>
 		<publisher>Superior Software/Acornsoft</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="24515">
@@ -3636,8 +3636,8 @@
 	</software>
 
 	<software name="firetrak">
-		<description>Fire Track</description>
-		<year>198?</year>
+		<description>FireTrack</description>
+		<year>1989</year>
 		<publisher>Superior Software/Acornsoft</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="19805">
@@ -5680,18 +5680,18 @@
 		<description>Mexico 86</description>
 		<year>1986</year>
 		<publisher>Qualsoft</publisher>
-		<part name="cass" interface="electron_cass">
-			<feature name="part_id" value="Finals"/>
-			<dataarea name="cass" size="8478">
-				<rom name="mexico86finals_e.uef" size="8478" crc="a70af89d" sha1="3ba32b540cd0c422406ed49e6054bea9cc9000ec" offset="0"/>
-			</dataarea>
-		</part>
-		<part name="cass" interface="electron_cass">
+		<part name="cass1" interface="electron_cass">
 			<feature name="part_id" value="Qualifiers"/>
 			<dataarea name="cass" size="8557">
 				<rom name="mexico86qualifiers_e.uef" size="8557" crc="2398c3a2" sha1="9610c80168d7ac65a56531ab940aecc58d013d0e" offset="0"/>
 			</dataarea>
 		</part>
+		<part name="cass2" interface="electron_cass">
+			<feature name="part_id" value="Finals"/>
+			<dataarea name="cass" size="8478">
+				<rom name="mexico86finals_e.uef" size="8478" crc="a70af89d" sha1="3ba32b540cd0c422406ed49e6054bea9cc9000ec" offset="0"/>
+			</dataarea>
+		</part>
 	</software>
 
 	<software name="microlym">
@@ -6101,7 +6101,7 @@
 
 	<software name="omegaorb">
 		<description>Omega Orb</description>
-		<year>1986</year>
+		<year>1987</year>
 		<publisher>Audiogenic</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="22736">
@@ -6302,7 +6302,7 @@
 
 	<software name="pengwyn">
 		<description>Pengwyn</description>
-		<year>1984</year>
+		<year>1983</year>
 		<publisher>Postern</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="6915">
@@ -6818,7 +6818,7 @@
 
 	<software name="ravskull">
 		<description>Ravenskull</description>
-		<year>1987</year>
+		<year>1986</year>
 		<publisher>Superior Software</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="24836">
@@ -6878,7 +6878,7 @@
 
 	<software name="redcoats">
 		<description>Red Coats</description>
-		<year>1985</year>
+		<year>1984</year>
 		<publisher>Lothlorien</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="10181">
@@ -7524,7 +7524,7 @@
 	</software>
 
 	<software name="skirmishpias" cloneof="skirmish">
-		<description>Skirmish (Play It Again Sam-12)</description>
+		<description>Skirmish (Play It Again Sam 12)</description>
 		<year>1990</year>
 		<publisher>Superior Software/Acornsoft</publisher>
 		<part name="cass" interface="electron_cass">
@@ -7847,7 +7847,7 @@
 
 	<software name="sphdest">
 		<description>Sphere of Destiny</description>
-		<year>1986</year>
+		<year>1987</year>
 		<publisher>Audiogenic</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="21816">
@@ -9155,7 +9155,7 @@
 
 	<software name="themine">
 		<description>The Mine</description>
-		<year>1984</year>
+		<year>1983</year>
 		<publisher>Micro Power</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="10185">
@@ -10295,8 +10295,8 @@
 	</software>
 
 	<software name="yiear">
-		<description>Yie Ar Kung Fu</description>
-		<year>1984</year>
+		<description>Yie Ar Kung-Fu</description>
+		<year>1985</year>
 		<publisher>Imagine</publisher>
 		<part name="cass" interface="electron_cass">
 			<dataarea name="cass" size="19064">
@@ -10306,7 +10306,7 @@
 	</software>
 
 	<software name="yiear2">
-		<description>Yie Ar Kung Fu 2</description>
+		<description>Yie Ar Kung-Fu 2</description>
 		<year>198?</year>
 		<publisher>Imagine</publisher>
 		<part name="cass" interface="electron_cass">