diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml
index 10ae5952557..9ad1d3eb6c2 100644
--- a/hash/spectrum_cass.xml
+++ b/hash/spectrum_cass.xml
@@ -520,7 +520,7 @@ license:CC0
 	<software name="altbeast">
 		<description>Altered Beast (set 1)</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="51918">
 				<rom name="altered beast - side 1.tzx" size="51918" crc="14ace5ed" sha1="6ce4aca116101b5b385214b7b33c257e3c25e475"/>
@@ -536,7 +536,7 @@ license:CC0
 	<software name="altbeastm" cloneof="altbeast">
 		<description>Altered Beast (set 2, MCM)</description>
 		<year>1989</year>
-		<publisher>Activision Inc / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="46970">
 				<rom name="altered beast - alternate - side 1 (mcm).tzx" size="46970" crc="1d13d6ad" sha1="5f15b8034d838dfe7daf30c728cb34a4d05cc307"/>
@@ -552,7 +552,7 @@ license:CC0
 	<software name="altbeasths" cloneof="altbeast">
 		<description>Altered Beast (set 3, The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="52049">
 				<rom name="altered beast - side 1 (the hit squad).tzx" size="52049" crc="0d2190b8" sha1="293f5bd33cbc1ba5a63ce00c891967c215429fe4"/>
@@ -989,7 +989,7 @@ license:CC0
 	<software name="aburner">
 		<description>Afterburner</description>
 		<year>1988</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="108928">
 				<rom name="afterburner - 128k.tzx" size="108928" crc="bba36351" sha1="0b14ab50e007105fc6dccd6ee93ae92f33eab512"/>
@@ -1010,7 +1010,7 @@ license:CC0
 	<software name="aburnerm" cloneof="aburner">
 		<description>Afterburner (MCM)</description>
 		<year>1988</year>
-		<publisher>Activision Inc / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="49560">
 				<rom name="afterburner - side 1 (mcm).tzx" size="49560" crc="be7113ce" sha1="0dc5b5b48687e8a0a892a89e1ef29a13c1ca9f49"/>
@@ -1026,7 +1026,7 @@ license:CC0
 	<software name="aburnerhs" cloneof="aburner">
 		<description>Afterburner (The Hit Squad)</description>
 		<year>1988</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="108315">
 				<rom name="afterburner (the hit squad).tzx" size="108315" crc="36abf45f" sha1="c9bfabd0879bf320eb34411b4f2e0ea8759d2553"/>
@@ -2585,8 +2585,8 @@ license:CC0
 
 	<software name="bruceleea" cloneof="brucelee">
 		<description>Bruce Lee (set 2, Americana)</description>
-		<year>1984</year>
-		<publisher>U.S. Gold / Americana</publisher>
+		<year>1988</year>
+		<publisher>Americana</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="42604">
 				<rom name="bruce lee (americana).tzx" size="42604" crc="3a2b7421" sha1="0a4a759fa09a356c27014bb5a320cfa40615a582"/>
@@ -2596,8 +2596,8 @@ license:CC0
 
 	<software name="bruceleed" cloneof="brucelee">
 		<description>Bruce Lee (set 3, Dro Soft)</description>
-		<year>1984</year>
-		<publisher>U.S. Gold / Dro Soft</publisher>
+		<year>1988</year>
+		<publisher>Dro Soft</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="42607">
 				<rom name="bruce lee (dro soft).tzx" size="42607" crc="ff93d0a7" sha1="bcd0db2383ebf5cb150ec17292f8ae934c316c09"/>
@@ -2608,7 +2608,7 @@ license:CC0
 	<software name="bruceleee" cloneof="brucelee">
 		<description>Bruce Lee (set 4, Erbe, Small Case)</description>
 		<year>1984</year>
-		<publisher>U.S. Gold / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="43865">
 				<rom name="bruce lee - small case (erbe).tzx" size="43865" crc="a77386c1" sha1="ed5692b9cebbd71efc3416d1f171bb2c62323804"/>
@@ -2670,12 +2670,34 @@ license:CC0
 			</dataarea>
 		</part>
 	</software>
+	
+	<software name="bruceleek" cloneof="brucelee">
+		<description>Bruce Lee (set 10, Erbe)</description>
+		<year>1988</year>
+		<publisher>Erbe Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="44827">
+				<rom name="Bruce Lee (Erbe).tzx" size="44827" crc="4161b758" sha1="7692d2142e12b8e3852f6d05ab072eb2aa7d5d3b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="bruceleel" cloneof="brucelee">
+		<description>Bruce Lee (set 11, Disprosoft)</description>
+		<year>1986</year>
+		<publisher>Disprosoft</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="43133">
+				<rom name="BruceLee(Disprosoft).tzx" size="43133" crc="dc8c2bc5" sha1="0928218950d2ee76b73c9e7f445ea94ae987959b"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<!-- corrupt bubble gfx in 48k mode?! (apparently an AY detection thing, does it work in 48k mode on real 128k systems?)-->
 	<software name="bublbobl" supported="partial">
 		<description>Bubble Bobble</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1987</year>
+		<publisher>Firebird Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="55769">
 				<rom name="bubble bobble.tzx" size="55769" crc="81e21559" sha1="3018566f3af3db4914a1a3bb4c8cf9240e48d5f0"/>
@@ -2683,10 +2705,32 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="bublbobla" cloneof="bublbobl">
+		<description>Bubble Bobble (Dro Soft)</description>
+		<year>1987</year>
+		<publisher>Dro Soft</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="55819">
+				<rom name="Bubble Bobble (Dro Soft).tzx" size="55819" crc="0c7bdcb1" sha1="e4a3102342831b6c4f946efe48eeb91d70c23a5c"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="bublboblb" cloneof="bublbobl">
+		<description>Bubble Bobble (Musical 1)</description>
+		<year>1992</year>
+		<publisher>Musical 1</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="47874">
+				<rom name="Bubble Bobble (Musical 1).tzx" size="47874" crc="11444344" sha1="2265394443c0e4a2aca14264f8e0f5b48fb174d3"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="bublboblhs" cloneof="bublbobl"> <!-- needs extra last block in tzx decoding to run -->
 		<description>Bubble Bobble (The Hit Squad)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1991</year>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="56655">
 				<rom name="bubble bobble (the hit squad).tzx" size="56655" crc="dd724bf5" sha1="ecbd2fb959a1adb4b088c20ae3cc5525c5c74f5b"/>
@@ -2705,7 +2749,6 @@ license:CC0
 		</part>
 	</software>
 
-
 	<software name="besiegsb">
 		<description>Besieged (Spellbound series)</description>
 		<year>1983</year>
@@ -2992,12 +3035,10 @@ license:CC0
 		</part>
 	</software>
 
-
-
 	<software name="btlc">
 		<description>Big Trouble In Little China (set 1)</description>
 		<year>1987</year>
-		<publisher>Electric Dreams Software</publisher>
+		<publisher>Electric Dreams</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51736">
 				<rom name="big trouble in little china.tzx" size="51736" crc="06e1e782" sha1="eea7d1530d837df10c1089c06701f29c51c07b95"/>
@@ -3008,7 +3049,7 @@ license:CC0
 	<software name="btlca" cloneof="btlc">
 		<description>Big Trouble In Little China (set 2, Alternative)</description>
 		<year>1987</year>
-		<publisher>Electric Dreams Software / Alternative</publisher>
+		<publisher>Alternative</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51766">
 				<rom name="big trouble in little china (alternative).tzx" size="51766" crc="ac0b5aaf" sha1="d41d49fe5b623a96abbde43c9fbb5a8319b6ad5b"/>
@@ -3019,7 +3060,7 @@ license:CC0
 	<software name="btlcb" cloneof="btlc">
 		<description>Big Trouble In Little China (set 3, Alternative)</description>
 		<year>1987</year>
-		<publisher>Electric Dreams Software / Alternative</publisher>
+		<publisher>Alternative</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51766">
 				<rom name="big trouble in little china (alternative, alt).tzx" size="51766" crc="9b17895c" sha1="c73ba75141b646195ca002f80beaf12da57dc141"/>
@@ -3027,11 +3068,10 @@ license:CC0
 		</part>
 	</software>
 
-
 	<software name="bttf">
-		<description>Back To The Future (set 1)</description>
+		<description>Back to the Future (set 1)</description>
 		<year>1985</year>
-		<publisher>Electric Dreams Software</publisher>
+		<publisher>Electric Dreams</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="57611">
 				<rom name="back to the future.tzx" size="57611" crc="f18d5256" sha1="e49a5352326c3c4f25b187e052a832c1efd1d80e"/>
@@ -3040,9 +3080,9 @@ license:CC0
 	</software>
 
 	<software name="bttfp" cloneof="bttf">
-		<description>Back To The Future (set 2, Proein)</description>
+		<description>Back to the Future (set 2, Proein)</description>
 		<year>1985</year>
-		<publisher>Electric Dreams Software / Proein</publisher>
+		<publisher>Proein</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="57726">
 				<rom name="back to the future (proein).tzx" size="57726" crc="d425c5e2" sha1="47552735b21f540834bbf96df620fda81771e338"/>
@@ -3051,9 +3091,9 @@ license:CC0
 	</software>
 
 	<software name="bttff" cloneof="bttf">
-		<description>Back To The Future (set 3, Firebird)</description>
+		<description>Back to the Future (set 3, Firebird)</description>
 		<year>1985</year>
-		<publisher>Electric Dreams Software / Firebird</publisher>
+		<publisher>Firebird</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="63170">
 				<rom name="back to the future (firebird).tzx" size="63170" crc="de7c5b76" sha1="393042b3860f68cb5eefe32e103d2dbd01d4657c"/>
@@ -3062,9 +3102,9 @@ license:CC0
 	</software>
 
 	<software name="bttfpa" cloneof="bttf">
-		<description>Back To The Future (Proein)</description>
+		<description>Back to the Future (Proein)</description>
 		<year>1985</year>
-		<publisher>Electric Dreams Software / Proein</publisher>
+		<publisher>Proein</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="58060">
 				<rom name="back to the future (proein)_tzx120.tzx" size="58060" crc="51c9a792" sha1="6790a3cf17f1684d633c71d40e3056eccd72aee0"/>
@@ -3072,9 +3112,8 @@ license:CC0
 		</part>
 	</software>
 
-
 	<software name="bttf2">
-		<description>Back To The Future - Part II</description>
+		<description>Back to the Future - Part II</description>
 		<year>1990</year>
 		<publisher>Image Works</publisher>
 		<part name="cass1" interface="spectrum_cass">
@@ -3090,9 +3129,9 @@ license:CC0
 	</software>
 
 	<software name="bttf2s" cloneof="bttf2">
-		<description>Regreso Al Futuro - Parte II (MCM)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Regreso al Futuro - Parte II (MCM)</description>
+		<year>1990</year>
+		<publisher>MCM Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="46382">
 				<rom name="regreso al futuro - parte ii - side 1 (mcm).tzx" size="46382" crc="e6533a8e" sha1="cca6e60658e73a4909db8db26700e2956d9d9603"/>
@@ -3106,7 +3145,7 @@ license:CC0
 	</software>
 
 	<software name="bttf3">
-		<description>Back To The Future - Part III</description>
+		<description>Back to the Future - Part III</description>
 		<year>1991</year>
 		<publisher>Image Works</publisher>
 		<part name="cass1" interface="spectrum_cass">
@@ -3121,10 +3160,26 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="bttf3a" cloneof="bttf3">
+		<description>Regreso al Futuro - Parte III (MCM)</description>
+		<year>1991</year>
+		<publisher>MCM Software</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="28322">
+				<rom name="Regreso Al Futuro - Parte III (MCM) - Side 1.tzx" size="28322" crc="174d4af4" sha1="bc21a928a3e63c414858e06bea77c734c8836102"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="194794">
+				<rom name="Regreso Al Futuro - Parte III (MCM) - Side 2.tzx" size="194794" crc="e91360b1" sha1="3e22567d1e955df68e6ee92cb673df439d90a29a"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="beamride">
 		<description>Beamrider</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="36277">
 				<rom name="beamrider.tzx" size="36277" crc="d493743e" sha1="eaea80b155a451b07ff0518815ec713a2742779b"/>
@@ -3190,7 +3245,7 @@ license:CC0
 	<software name="ballblzr"> <!-- were 128k and 48k versions on the same tape? -->
 		<description>Ballblazer (set 1)</description>
 		<year>1986</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="49844">
 				<rom name="ballblazer - 128k.tzx" size="49844" crc="548c5b2f" sha1="63805ec1837a68c688cec971fbb307f5eb31710c"/>
@@ -3206,7 +3261,7 @@ license:CC0
 	<software name="ballblzrr" cloneof="ballblzr">
 		<description>Ballblazer (set 2, Ricochet)</description>
 		<year>1986</year>
-		<publisher>Activision Inc / Ricochet</publisher>
+		<publisher>Ricochet</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47686">
 				<rom name="ballblazer (ricochet).tzx" size="47686" crc="7f69df2c" sha1="f217646a32c2e92f01fe57ec24e993882afbc32a"/>
@@ -3217,7 +3272,7 @@ license:CC0
 	<software name="ballblaz">
 		<description>Ballblazer (set 3)</description>
 		<year>1986</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50196">
 				<rom name="ballblazer_tzx120.tzx" size="50196" crc="a263aa8d" sha1="9614e3ae1ac5663eab0b84f0bfbae1392b55e4d9"/>
@@ -3765,7 +3820,7 @@ license:CC0
 	</software>
 
 	<software name="beachhd">
-		<description>Beach Head (set 1)</description>
+		<description>Beach-Head (set 1)</description>
 		<year>1984</year>
 		<publisher>U.S. Gold</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -3775,8 +3830,8 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="beachhda">
-		<description>Beach Head (set 2, Americana)</description>
+	<software name="beachhda" cloneof="beachhd">
+		<description>Beach-Head (set 2, Americana)</description>
 		<year>1984</year>
 		<publisher>Americana</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -3787,9 +3842,9 @@ license:CC0
 	</software>
 
 	<software name="beachhdb" cloneof="beachhd">
-		<description>Beach Head (set 3, Dro Soft)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Beach-Head (set 3, Dro Soft)</description>
+		<year>1988</year>
+		<publisher>Dro Soft</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48518">
 				<rom name="beach head (dro soft).tzx" size="48518" crc="4c05f151" sha1="da026fcadc463d37d2d432703270a320af1b159e"/>
@@ -3798,7 +3853,7 @@ license:CC0
 	</software>
 
 	<software name="beachhdc" cloneof="beachhd">
-		<description>Beach Head (set 4)</description>
+		<description>Beach-Head (set 4)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -3809,9 +3864,9 @@ license:CC0
 	</software>
 
 	<software name="beachhdd" cloneof="beachhd">
-		<description>Beach Head (set 5, Americana)</description>
+		<description>Beach-Head (set 5, Americana)</description>
 		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Americana</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49349">
 				<rom name="beach head (americana)_tzx120.tzx" size="49349" crc="c3263f1a" sha1="5939c88975e7100b29caa24226bd538b730d35cb"/>
@@ -3820,9 +3875,9 @@ license:CC0
 	</software>
 
 	<software name="beachhde" cloneof="beachhd">
-		<description>Beach Head (set 6, Dro Soft)</description>
+		<description>Beach-Head (set 6, Dro Soft)</description>
 		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Dro Soft</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49239">
 				<rom name="beach head (dro soft)_tzx120.tzx" size="49239" crc="42b32acc" sha1="b45f667b71f2ddf376586c5341167a1a13b72e1e"/>
@@ -3831,7 +3886,7 @@ license:CC0
 	</software>
 
 	<software name="beachhd2">
-		<description>Beach Head II (set 1)</description>
+		<description>Beach-Head II (set 1)</description>
 		<year>1985</year>
 		<publisher>U.S. Gold</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -3842,9 +3897,9 @@ license:CC0
 	</software>
 
 	<software name="beachhd2b" cloneof="beachhd2">
-		<description>Beach Head II (set 2, Dro Soft)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Beach-Head II (Dro Soft)</description>
+		<year>1988</year>
+		<publisher>Dro Soft</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="46134">
 				<rom name="beach head ii (dro soft).tzx" size="46134" crc="c128e5e0" sha1="93c8a646b4073beb74cdcd5ef63f7f9c9672b18c"/>
@@ -3853,9 +3908,9 @@ license:CC0
 	</software>
 
 	<software name="beachhd2a" cloneof="beachhd2">
-		<description>Beach Head II (set 3, Americana)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Beach-Head II (Americana)</description>
+		<year>1987</year>
+		<publisher>Americana</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="46570">
 				<rom name="beach head ii - side a (americana).tzx" size="46570" crc="a1413480" sha1="1ea68b3729eab1862c7e04419abca5422cd68ee9"/>
@@ -3869,7 +3924,7 @@ license:CC0
 	</software>
 
 	<software name="beachhd2c" cloneof="beachhd2">
-		<description>Beach Head II (set 4)</description>
+		<description>Beach-Head II (unknown)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -3879,6 +3934,17 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="beachhd2d" cloneof="beachhd2">
+		<description>Beach-Head II (Erbe)</description>
+		<year>1985</year>
+		<publisher>Erbe Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="50784">
+				<rom name="Beach Head II (Erbe).tzx" size="50784" crc="afc4a78a" sha1="bf4316ce4e59ea8161057d7ff308317a0a3742a3"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="bobsleig">
 		<description>Bobsleigh (set 1)</description>
 		<year>1987</year>
@@ -5643,7 +5709,7 @@ license:CC0
 	</software>
 
 	<software name="commandoed" cloneof="commando">
-		<description>Commando (set 3, EDOS)</description>
+		<description>Commando (EDOS)</description>
 		<year>1985</year>
 		<publisher>Elite Systems / EDOS</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -5654,8 +5720,8 @@ license:CC0
 	</software>
 
 	<software name="commandoen" cloneof="commando">
-		<description>Commando (set 4, Encore)</description>
-		<year>1985</year>
+		<description>Commando (Encore)</description>
+		<year>1988</year>
 		<publisher>Elite Systems / Encore</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49227">
@@ -5836,7 +5902,7 @@ license:CC0
 	<software name="chasehq">
 		<description>Chase HQ (set 1)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="121419">
 				<rom name="chase hq - side 1.tzx" size="121419" crc="448b75a0" sha1="9aec23de8ba019c2d5835bad746d236358f3403c"/>
@@ -5852,7 +5918,7 @@ license:CC0
 	<software name="chasehqe" cloneof="chasehq">
 		<description>Chase HQ (set 2, Erbe - Serie 5 Estrellas)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="117157">
 				<rom name="chase hq (erbe - serie 5 estrellas) - side a.tzx" size="117157" crc="b55f73f7" sha1="2e3ca60e68c9fe8cb67712b563cd98dcfb5dcebc"/>
@@ -5868,7 +5934,7 @@ license:CC0
 	<software name="chasehqhs" cloneof="chasehq">
 		<description>Chase HQ (set 3, The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="117159">
 				<rom name="chase hq - side 1 (the hit squad).tzx" size="117159" crc="d61b78a4" sha1="cb0319fe97b932a12a9fa506536ee7e2c8147c37"/>
@@ -5884,7 +5950,7 @@ license:CC0
 	<software name="chasehqp" cloneof="chasehq">
 		<description>Chase HQ (set 4, Portugal)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="88080">
 				<rom name="chase hq - side 1 {portuguese}.tzx" size="88080" crc="c5e8bcbe" sha1="3e5ab05e7fbb236f09b66d3d00077b8bdbe000ad"/>
@@ -5900,7 +5966,7 @@ license:CC0
 	<software name="chasehqa" cloneof="chasehq">
 		<description>Chase HQ (set 5)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="121170">
 				<rom name="chase hq - side 1_tzx120.tzx" size="121170" crc="6d9a501d" sha1="836e7b545fd5002ae5cefb975712dbbf3b84bd2a"/>
@@ -5918,7 +5984,7 @@ license:CC0
 	<software name="sci">
 		<description>Special Criminal Investigation - Chase HQ 2</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="120141">
 				<rom name="chase hq 2.tzx" size="120141" crc="4440385c" sha1="1a54b3194e46e388d3dc0b52d9b3dce19f0ec385"/>
@@ -5929,7 +5995,7 @@ license:CC0
 	<software name="scia" cloneof="sci">
 		<description>Special Criminal Investigation - Chase HQ 2 (Erbe)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="120141">
 				<rom name="chase hq 2 (erbe).tzx" size="120141" crc="73a875d3" sha1="19bdc80282fdcf9f386612b7830ac0c09e6999a4"/>
@@ -5995,7 +6061,7 @@ license:CC0
 	<software name="cobra">
 		<description>Cobra</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48571">
 				<rom name="cobra.tzx" size="48571" crc="91374af1" sha1="2e91747fcd14b37a9ddda92e5f94f4ad5d7ad17e"/>
@@ -6006,7 +6072,7 @@ license:CC0
 	<software name="cobrahs" cloneof="cobra">
 		<description>Cobra (The Hit Squad)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49514">
 				<rom name="cobra (the hit squad).tzx" size="49514" crc="45c9f9db" sha1="89899dea937ed1a545d7885700ef81bd20d5df27"/>
@@ -6017,7 +6083,7 @@ license:CC0
 	<software name="cobraa" cloneof="cobra">
 		<description>Cobra (set 2)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48746">
 				<rom name="cobra - alternate.tzx" size="48746" crc="fdf76f3b" sha1="5da55a5e766df884d7dd5bf6462a916f4bd201e7"/>
@@ -7301,7 +7367,7 @@ license:CC0
 	<software name="deflektr">
 		<description>Deflektor</description>
 		<year>1987</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="58760">
 				<rom name="deflektor.tzx" size="58760" crc="45a49ade" sha1="ee96f6142c0f05ed7a65bc2db02befd0357b727b"/>
@@ -7400,7 +7466,7 @@ license:CC0
 	<software name="dbreed">
 		<description>Dragon Breed</description>
 		<year>1990</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="37091">
 				<rom name="dragon breed - side 1.tzx" size="37091" crc="f8cc7469" sha1="d4f46801779b7d335c6dc60c4dec534284a9a6eb"/>
@@ -7416,7 +7482,7 @@ license:CC0
 	<software name="ddux">
 		<description>Dynamite Dux</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="60073">
 				<rom name="dynamite dux - side 1.tzx" size="60073" crc="d8e85c6c" sha1="0a5d453f5eb4bf3d19851e100d0ed23fdf9151ce"/>
@@ -7432,7 +7498,7 @@ license:CC0
 	<software name="dduxm" cloneof="ddux">
 		<description>Dynamite Dux (MCM)</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="72445">
 				<rom name="dynamite dux - side 1 (mcm).tzx" size="72445" crc="5f456fd5" sha1="8252165c6e231f6650060be0e1ddf0c4d195ff76"/>
@@ -7448,7 +7514,7 @@ license:CC0
 	<software name="desgpenc">
 		<description>The Designer's Pencil</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="43145">
 				<rom name="the designer_s pencil.tzx" size="43145" crc="10d66dad" sha1="c6efd0b8a11e0fb23cba115cb44831b75c6ba795"/>
@@ -7666,7 +7732,7 @@ license:CC0
 	<software name="daleydec">
 		<description>Daley Thompson's Decathlon (set 1, large case)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="49918">
 				<rom name="daley thompson_s decathlon - day 1 - large case.tzx" size="49918" crc="da38b28e" sha1="9a23a1d68274f688e6b26426cc90c9a4fc53f1c7"/>
@@ -7682,7 +7748,7 @@ license:CC0
 	<software name="daleydeca" cloneof="daleydec">
 		<description>Daley Thompson's Decathlon (set 2, small case)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="49938">
 				<rom name="daley thompson_s decathlon - day 1 - small case.tzx" size="49938" crc="520ac64a" sha1="60eb4bd7820574bfc48641332328f177ff5690ac"/>
@@ -7698,7 +7764,7 @@ license:CC0
 	<software name="daleydechs" cloneof="daleydec">
 		<description>Daley Thompson's Decathlon (set 3, The Hit Squad)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="54722">
 				<rom name="daley thompson_s decathlon - day 1 (the hit squad).tzx" size="54722" crc="fcfce1f2" sha1="840c436a79a9492adcdc620aea35cb17a8ce6300"/>
@@ -7714,7 +7780,7 @@ license:CC0
 	<software name="daleydecz" cloneof="daleydec">
 		<description>Daley Thompson's Decathlon (set 4, Zafiro)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd / Zafiro</publisher>
+		<publisher>Zafiro</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="49933">
 				<rom name="daley thompson_s decathlon - side a (zafiro).tzx" size="49933" crc="1ba40592" sha1="7e544e2e95468cbbebbff01ec1ec65f7c1a4a374"/>
@@ -7730,7 +7796,7 @@ license:CC0
 	<software name="daleydecl" cloneof="daleydec">
 		<description>Daley Thompson's Decathlon (set 6, large case)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50302">
 				<rom name="daley thompson_s decathlon - day 1 - large case_tzx120.tzx" size="50302" crc="f5d34fe7" sha1="fa43fe052345abeb1a2cd7747a7bb6bc4c51650a"/>
@@ -7746,7 +7812,7 @@ license:CC0
 	<software name="daleydecs" cloneof="daleydec">
 		<description>Daley Thompson's Decathlon (set 7, small case)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50334">
 				<rom name="daley thompson_s decathlon - day 1 - small case_tzx120.tzx" size="50334" crc="59d6bc9f" sha1="cc45332dfe6ae93fd33b00142cfc7188771e353b"/>
@@ -7762,7 +7828,7 @@ license:CC0
 	<software name="daleydecza" cloneof="daleydec">
 		<description>Daley Thompson's Decathlon (set 8, Zafiro)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd / Zafiro</publisher>
+		<publisher>Zafiro</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50313">
 				<rom name="daley thompson_s decathlon - side a (zafiro)_tzx120.tzx" size="50313" crc="c62a276f" sha1="dd3047f6b6810ecc226d7ad38074f55914b6bccc"/>
@@ -7778,7 +7844,7 @@ license:CC0
 	<software name="daleyoc">
 		<description>Daley Thompson's Olympic Challenge</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="128265">
 				<rom name="daley thompson_s olympic challenge - side 1.tzx" size="128265" crc="ccf88da7" sha1="f28bbadd0a05611f81a1d1ac72041a4be65154f8"/>
@@ -7794,7 +7860,7 @@ license:CC0
 	<software name="daleyochs" cloneof="daleyoc">
 		<description>Daley Thompson's Olympic Challenge (The Hit Squad)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="125986">
 				<rom name="daley thompson_s olympic challenge (the hit squad).tzx" size="125986" crc="d5f00878" sha1="85be1c32d016cee1f77a92b1777437cfe9cce75c"/>
@@ -7806,7 +7872,7 @@ license:CC0
 	<software name="daleyst">
 		<description>Daley Thompson's Supertest (set 1, 128k)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="128316">
 				<rom name="daley thompson_s supertest - 128k.tzx" size="128316" crc="79b1bed7" sha1="305e7fe3e653584de858739af2767d49bf33f61f"/>
@@ -7817,7 +7883,7 @@ license:CC0
 	<software name="daleysta" cloneof="daleyst">
 		<description>Daley Thompson's Supertest (set 2, 48k)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50646">
 				<rom name="daley thompson_s supertest - day 1 - 48k.tzx" size="50646" crc="5a5a6894" sha1="7b50c3c2cdbc746276c9e63cc9cd2b5af8e385fd"/>
@@ -7833,7 +7899,7 @@ license:CC0
 	<software name="daleysths" cloneof="daleyst">
 		<description>Daley Thompson's Supertest (set 3, 128k/48k, The Hit Squad)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="130140">
 				<rom name="daley thompson_s supertest - 128k (the hit squad).tzx" size="130140" crc="be64db49" sha1="935ba6c55c29c39661a4d5104b47448f0bc1e666"/>
@@ -7860,7 +7926,7 @@ license:CC0
 	<software name="daleystb" cloneof="daleyst">
 		<description>Daley Thompson's Supertest (set 5, 48k)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50368">
 				<rom name="daley thompson_s supertest - day 1 - 48k_tzx120.tzx" size="50368" crc="5674604d" sha1="c0ea81c9904ce547a68928d6e57a8ced83b9e5ab"/>
@@ -7974,7 +8040,7 @@ license:CC0
 	<software name="theduct">
 		<description>The Duct</description>
 		<year>1988</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47152">
 				<rom name="the duct.tzx" size="47152" crc="3fec12ab" sha1="3d56f585aa108b141566557d2f541b364b80636e"/>
@@ -8023,7 +8089,7 @@ license:CC0
 	<software name="dspirit">
 		<description>Dragon Spirit</description>
 		<year>1989</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="164413">
 				<rom name="dragon spirit.tzx" size="164413" crc="892add91" sha1="c579e0b6932cbaf324001a1f29da6e0b8bbd164e"/>
@@ -8034,7 +8100,7 @@ license:CC0
 	<software name="dspiriths" cloneof="dspirit">
 		<description>Dragon Spirit (The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Domark Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="164952">
 				<rom name="dragon spirit (the hit squad).tzx" size="164952" crc="cc18d6d1" sha1="73b376e03b156a8d9dfa556adbedfe95a3c25dc5"/>
@@ -8719,7 +8785,6 @@ license:CC0
 		</part>
 	</software>
 
-
 	<software name="exolon">
 		<description>Exolon</description>
 		<year>1987</year>
@@ -8742,8 +8807,19 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="eddduck" supported="no"> <!-- fails to load, last block issue? -->
-		<description>Edd The Duck!</description>
+	<software name="eddduck">
+		<description>Edd the Duck! (bug fix)</description>
+		<year>1990</year>
+		<publisher>Impulze</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="44167">
+				<rom name="edd the duck (bugfix).tzx" size="44167" crc="dfc4785e" sha1="2be555fd806e9c9b47c20d099376ea0051428f57"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="eddducka" cloneof="eddduck" supported="no"> <!-- fails to load, last block issue? -->
+		<description>Edd the Duck!</description>
 		<year>1990</year>
 		<publisher>Impulze</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -8753,10 +8829,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="eddduckz" cloneof="eddduck" supported="no"> <!-- fails to load, last block issue? -->
-		<description>Edd The Duck! (Zeppelin)</description>
+	<software name="eddduckb" cloneof="eddduck" supported="no"> <!-- fails to load, last block issue? -->
+		<description>Edd the Duck! (Zeppelin)</description>
 		<year>1990</year>
-		<publisher>Impulze / Zeppelin Games</publisher>
+		<publisher>Zeppelin Games</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="42959">
 				<rom name="edd the duck (zeppelin).tzx" size="42959" crc="7798008f" sha1="7795f01c2fdb2a9df18b86dce4bafd406b248682"/>
@@ -8767,7 +8843,7 @@ license:CC0
 	<software name="enduro">
 		<description>Enduro</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="14437">
 				<rom name="enduro.tzx" size="14437" crc="1d5f1906" sha1="4bcd9ce56165cabd56d5653fbace061cec9a8a00"/>
@@ -8789,7 +8865,7 @@ license:CC0
 	<software name="eidolon">
 		<description>The Eidolon (Ricochet)</description>
 		<year>1986</year>
-		<publisher>Activision Inc / Ricochet</publisher>
+		<publisher>Ricochet</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="108001">
 				<rom name="the eidolon - side 1 (ricochet).tzx" size="108001" crc="2ee8d352" sha1="eff6c64bbed3fb3b142f538594fd09c32798f5eb"/>
@@ -8805,7 +8881,7 @@ license:CC0
 	<software name="enduror">
 		<description>Enduro Racer (set 1)</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50202">
 				<rom name="enduro racer.tzx" size="50202" crc="910b898b" sha1="1e52a9aaf9d75f525a0a5e4e84073b967b006bfe"/>
@@ -8816,7 +8892,7 @@ license:CC0
 	<software name="endurorp" cloneof="enduror">
 		<description>Enduro Racer (set 2, Proein)</description>
 		<year>1987</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<publisher>Proein Soft Line</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50292">
 				<rom name="enduro racer (proein).tzx" size="50292" crc="4302bde7" sha1="c235754a2ff3209cb520411fe8b89d5032f6337b"/>
@@ -8827,7 +8903,7 @@ license:CC0
 	<software name="endurorhq" cloneof="enduror">
 		<description>Enduro Racer (set 3, The Hit Squad)</description>
 		<year>1987</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="52044">
 				<rom name="enduro racer (the hit squad).tzx" size="52044" crc="7e1b0acd" sha1="32549837747ae6494332a9d71929276f4c35f5b8"/>
@@ -8904,7 +8980,7 @@ license:CC0
 	<software name="esb">
 		<description>The Empire Strikes Back</description>
 		<year>1988</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="54541">
 				<rom name="the empire strikes back.tzx" size="54541" crc="5db9c840" sha1="63632ab59e98f7d792ce0c5ddccade6369af3de2"/>
@@ -8915,7 +8991,7 @@ license:CC0
 	<software name="esbhs" cloneof="esb">
 		<description>The Empire Strikes Back (The Hit Squad)</description>
 		<year>1988</year>
-		<publisher>Domark Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="54187">
 				<rom name="the empire strikes back (the hit squad).tzx" size="54187" crc="fbb62a16" sha1="5370bef4f34ca38104631011fffbf90b16738fc4"/>
@@ -9482,7 +9558,7 @@ license:CC0
 	<software name="fbomber"> <!-- all data on single side? -->
 		<description>Fighter Bomber</description>
 		<year>1990</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="167502">
 				<rom name="fighter bomber.tzx" size="167502" crc="9d37b016" sha1="5629aca2ae6db98707afd68fb4657779596776a3"/>
@@ -9493,7 +9569,7 @@ license:CC0
 	<software name="fbomberm" cloneof="fbomber">
 		<description>Fighter Bomber (MCM)</description>
 		<year>1990</year>
-		<publisher>Activision Inc / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50412">
 				<rom name="fighter bomber - side 1 (mcm).tzx" size="50412" crc="f4758c50" sha1="c7f97a348465cdfd27f9b1b51aef320b0e882836"/>
@@ -9509,7 +9585,7 @@ license:CC0
 	<software name="fgtsocr">
 		<description>Fighting Soccer</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="110962">
 				<rom name="fighting soccer.tzx" size="110962" crc="ff9c5ecf" sha1="77219a6e29864e2e4f187af52bede18799ec90e5"/>
@@ -9544,7 +9620,7 @@ license:CC0
 	<software name="friday13">
 		<description>Friday The 13th</description>
 		<year>1986</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="44038">
 				<rom name="friday the 13th.tzx" size="44038" crc="ef7fddae" sha1="d3791c6b7393ae8aceac2775e0405459abaf997b"/>
@@ -9632,7 +9708,7 @@ license:CC0
 	<software name="frankie">
 		<description>Frankie Goes to Hollywood - The Computer Game (set 1)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51115">
 				<rom name="frankie.tzx" size="51115" crc="eced0ddb" sha1="367472bc6b8bba9b96ca12c999ff12c70fdf3039"/>
@@ -9643,7 +9719,7 @@ license:CC0
 	<software name="frankiea" cloneof="frankie">
 		<description>Frankie Goes to Hollywood - The Computer Game (set 2)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50837">
 				<rom name="frankie goes to hollywood_tzx120.tzx" size="50837" crc="e1fea946" sha1="94e648f8be911e9da28206db88ce721cf5660b79"/>
@@ -10608,7 +10684,7 @@ license:CC0
 	<software name="ghobust">
 		<description>Ghostbusters (set 1, 128k)</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="70309">
 				<rom name="ghostbusters - 128k.tzx" size="70309" crc="b12cc173" sha1="f26240af9b18f6c1d0be8cc9c8770334055d2135"/>
@@ -10616,10 +10692,21 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="ghobust48" cloneof="ghobust">
-		<description>Ghostbusters (set 2, 48k)</description>
+	<software name="ghobusta" cloneof="ghobust">
+		<description>Ghostbusters (set 2, 128k)</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="70710">
+				<rom name="ghostbusters - 128k_tzx120.tzx" size="70710" crc="0cb2d310" sha1="4bd278b31f86e70959bd01c1c22272e1dec388b7"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ghobust48" cloneof="ghobust">
+		<description>Ghostbusters (set 1, 48k)</description>
+		<year>1984</year>
+		<publisher>Activision</publisher>
 		<part name="cass2" interface="spectrum_cass">
 			<dataarea name="cass" size="41601">
 				<rom name="ghostbusters - 48k.tzx" size="41601" crc="277a58c3" sha1="5534f6ef8be0bf099ec913fa89adf89d90f52e68"/>
@@ -10627,20 +10714,19 @@ license:CC0
 		</part>
 	</software>
 
-	<!-- NC128 -->
-	<software name="ghobustp" cloneof="ghobust">
-		<description>Ghostbusters (set 3, Proein)</description>
+	<software name="ghobust48a" cloneof="ghobust">
+		<description>Ghostbusters (set 2, 48k)</description>
 		<year>1984</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="40819">
-				<rom name="ghostbusters (proein).tzx" size="40819" crc="b61fec4b" sha1="8a84818ab407f10a26b691658febf900b0fa2515"/>
+			<dataarea name="cass" size="41314">
+				<rom name="ghostbusters_tzx120.tzx" size="41314" crc="3606fb43" sha1="5242fc02c6a99ee34724b3ae3a103e9e742535f0"/>
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="ghobusts" cloneof="ghobust">
-		<description>Ghostbusters (set 4, Spectrum Vision)</description>
+		<description>Ghostbusters (Spectrum Vision)</description>
 		<year>1984</year>
 		<publisher>Activision Inc / Spectrum Vision</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -10651,9 +10737,9 @@ license:CC0
 	</software>
 
 	<software name="ghobustr" cloneof="ghobust">
-		<description>Ghostbusters (set 5, Ricochet)</description>
+		<description>Ghostbusters (Ricochet)</description>
 		<year>1984</year>
-		<publisher>Activision Inc / Ricochet</publisher>
+		<publisher>Ricochet</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="38601">
 				<rom name="ghostbusters (ricochet).tzx" size="38601" crc="696394cc" sha1="a38315bc3eae06a6e9437f249681732aea34c006"/>
@@ -10661,10 +10747,22 @@ license:CC0
 		</part>
 	</software>
 
+	<!-- NC128 -->
+	<software name="ghobustp" cloneof="ghobust">
+		<description>Ghostbusters (set 1, Proein)</description>
+		<year>1985</year>
+		<publisher>Proein Soft Line</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="40819">
+				<rom name="ghostbusters (proein).tzx" size="40819" crc="b61fec4b" sha1="8a84818ab407f10a26b691658febf900b0fa2515"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="ghobustpa" cloneof="ghobust">
-		<description>Ghostbusters (set 6, Proein)</description>
+		<description>Ghostbusters (set 2, Proein)</description>
 		<year>1984</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<publisher>Proein Soft Line</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="41199">
 				<rom name="ghostbusters (proein)_tzx120.tzx" size="41199" crc="aa61a813" sha1="f74fd70d17ef5e19f5164b29710842229c5640dd"/>
@@ -10672,30 +10770,8 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="ghobusta" cloneof="ghobust">
-		<description>Ghostbusters (set 7, 128k)</description>
-		<year>1984</year>
-		<publisher>Activision Inc</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="70710">
-				<rom name="ghostbusters - 128k_tzx120.tzx" size="70710" crc="0cb2d310" sha1="4bd278b31f86e70959bd01c1c22272e1dec388b7"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="ghobust48a" cloneof="ghobust">
-		<description>Ghostbusters (set 8, 48k)</description>
-		<year>1984</year>
-		<publisher>Activision Inc</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="41314">
-				<rom name="ghostbusters_tzx120.tzx" size="41314" crc="3606fb43" sha1="5242fc02c6a99ee34724b3ae3a103e9e742535f0"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="ghobustlsh" cloneof="ghobust">
-		<description>Ghostbusters (set 9, 128k, loading screen hack)</description>
+		<description>Ghostbusters (128k, loading screen hack)</description>
 		<year>19??</year>
 		<publisher>hack</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -10706,7 +10782,7 @@ license:CC0
 	</software>
 
 	<software name="ghobust48alsh" cloneof="ghobust">
-		<description>Ghostbusters (set 10, 48k, loading screen hack)</description>
+		<description>Ghostbusters (48k, loading screen hack)</description>
 		<year>19??</year>
 		<publisher>hack</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -10718,9 +10794,9 @@ license:CC0
 
 
 	<software name="ghobust2">
-		<description>Ghostbusters II (set 1)</description>
+		<description>Ghostbusters II</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="140373">
 				<rom name="ghostbusters ii.tzx" size="140373" crc="071370c3" sha1="fe57569699f00133ac55bb672b6cafb2a6f5e91e"/>
@@ -10729,9 +10805,9 @@ license:CC0
 	</software>
 
 	<software name="ghobust2h" cloneof="ghobust2">
-		<description>Ghostbusters II (set 2, The Hit Squad)</description>
+		<description>Ghostbusters II (The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="140467">
 				<rom name="ghostbusters ii (the hit squad).tzx" size="140467" crc="aad34a31" sha1="60d6d82f8802eb169c798224c91d74bbb6377a3c"/>
@@ -10740,9 +10816,9 @@ license:CC0
 	</software>
 
 	<software name="cazafan2" cloneof="ghobust2">
-		<description>Ghostbusters II (set 3, Cazafantasmas II, MCM)</description>
+		<description>Ghostbusters II (set 1, Cazafantasmas II, MCM)</description>
 		<year>1989</year>
-		<publisher>Activision Inc / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="139744">
 				<rom name="cazafantasmas ii (mcm).tzx" size="139744" crc="a767e682" sha1="bc9a102911090a865f5fc660b99c384773a423e7"/>
@@ -10751,9 +10827,9 @@ license:CC0
 	</software>
 
 	<software name="cazafan2a" cloneof="ghobust2">
-		<description>Ghostbusters II (set 4, Cazafantasmas II, MCM)</description>
+		<description>Ghostbusters II (set 2, Cazafantasmas II, MCM)</description>
 		<year>1989</year>
-		<publisher>Activision Inc / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="139748">
 				<rom name="cazafantasmas ii (mcm) (alt).tzx" size="139748" crc="0558909a" sha1="143866f9bf70cb747ad7e67a745986684130ae60"/>
@@ -10777,7 +10853,7 @@ license:CC0
 	<software name="grumpy">
 		<description>Grumpy Gumphrey Supersleuth</description>
 		<year>1985</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49815">
 				<rom name="grumpy gumphrey super sleuth.tzx" size="49815" crc="ee6ce707" sha1="d01e2bd43433ef92dfdcc9f2d5b070b0fded0190"/>
@@ -10938,7 +11014,7 @@ license:CC0
 	<software name="realgb"> <!-- all data on single side -->
 		<description>The Real Ghostbusters</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="232847">
 				<rom name="the real ghostbusters.tzx" size="232847" crc="f73747d9" sha1="e3d78ea4a5fbf5edc4a03036943de48241f8fe13"/>
@@ -10949,7 +11025,7 @@ license:CC0
 	<software name="realgbm" cloneof="realgb">
 		<description>The Real Ghostbusters (MCM)</description>
 		<year>1989</year>
-		<publisher>Activision Inc / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="39819">
 				<rom name="the real ghostbusters - side 1 (mcm).tzx" size="39819" crc="0830a816" sha1="44373e45860347b09a6b8b8d4cecb5f6688b5749"/>
@@ -10965,7 +11041,7 @@ license:CC0
 	<software name="realgbmhs" cloneof="realgb">
 		<description>The Real Ghostbusters (The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="44836">
 				<rom name="the real ghostbusters - side 1 (the hit squad).tzx" size="44836" crc="da7e64c7" sha1="3952a862b967890b5798df37ce3570f3dcc25b74"/>
@@ -10981,7 +11057,7 @@ license:CC0
 	<software name="galgames">
 		<description>Galactic Games</description>
 		<year>1988</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="104179">
 				<rom name="galactic games - side a.tzx" size="104179" crc="d626ac03" sha1="ddb0e7da8275712be1e818b7ce3c83a7a9bb5632"/>
@@ -11000,7 +11076,7 @@ license:CC0
 	<software name="gforce">
 		<description>Galaxy Force</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="45826">
 				<rom name="galaxy force - side a.tzx" size="45826" crc="aeb58a81" sha1="8a37f5e282d4e5b10b51c243cc9250c2621b0123"/>
@@ -11016,7 +11092,7 @@ license:CC0
 	<software name="gforcem" cloneof="gforce">
 		<description>Galaxy Force (MCM)</description>
 		<year>1989</year>
-		<publisher>Activision Inc / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="40669">
 				<rom name="galaxy force - side 1 (mcm).tzx" size="40669" crc="d723f7c7" sha1="83221e203483a051802ed493ba7c60bea63a62bd"/>
@@ -11054,7 +11130,7 @@ license:CC0
 	<software name="guadalca">
 		<description>Guadalcanal</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="46570">
 				<rom name="guadalcanal.tzx" size="46570" crc="bb477a2c" sha1="6ef50cc04e77cfb6b28d76bfca587c4a144f637c"/>
@@ -11305,7 +11381,7 @@ license:CC0
 	<software name="greatesc">
 		<description>The Great Escape (set 1)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51646">
 				<rom name="the great escape.tzx" size="51646" crc="da487485" sha1="0183c32e3e8edc14254caca71a6226c7b09f4bb1"/>
@@ -11316,7 +11392,7 @@ license:CC0
 	<software name="greatesce" cloneof="greatesc">
 		<description>The Great Escape (set 2, Erbe)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51327">
 				<rom name="the great escape (erbe).tzx" size="51327" crc="42f881de" sha1="e564741d8e18ad9bc25b279a8b00ecf6309369ae"/>
@@ -11327,7 +11403,7 @@ license:CC0
 	<software name="greatescera" cloneof="greatesc">
 		<description>The Great Escape (set 3, Erbe, Small Cassette)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51304">
 				<rom name="the great escape - small cassette (erbe).tzx" size="51304" crc="cb34c207" sha1="4d4ed2d3d33bf77b2b852e0cd774d9c3a63ccc0c"/>
@@ -11338,7 +11414,7 @@ license:CC0
 	<software name="greateschs" cloneof="greatesc">
 		<description>The Great Escape (set 4, The Hit Squad)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51646">
 				<rom name="the great escape (the hit squad).tzx" size="51646" crc="2c9401de" sha1="00e78af6b1d8b429f3f9d9d0694aa45659e33509"/>
@@ -11349,7 +11425,7 @@ license:CC0
 	<software name="greatescp" cloneof="greatesc">
 		<description>The Great Escape (set 5, Portugal)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="44939">
 				<rom name="the great escape {portuguese}.tzx" size="44939" crc="5c0d7ad5" sha1="d4d3bc254186426cddc3b2bfc2e209a9070fe329"/>
@@ -11360,7 +11436,7 @@ license:CC0
 	<software name="greatesca" cloneof="greatesc">
 		<description>The Great Escape (set 6)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51325">
 				<rom name="the great escape_tzx120.tzx" size="51325" crc="251fe86f" sha1="1b183ddefbfc2a0cfbcb6da8b11f2436f3f1e48e"/>
@@ -11830,7 +11906,7 @@ license:CC0
 	<software name="headheel">
 		<description>Head Over Heels (set 1)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50595">
 				<rom name="head over heels.tzx" size="50595" crc="ade4881f" sha1="5eefaea7907f1ab84fb5be62b62072147ee3a3ff"/>
@@ -11841,7 +11917,7 @@ license:CC0
 	<software name="headheelhs" cloneof="headheel">
 		<description>Head Over Heels (set 2, The Hit Squad)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51739">
 				<rom name="head over heels (the hit squad).tzx" size="51739" crc="0b21205e" sha1="6d8b166043d8a818ea9efb6411fc8ac6da3b5236"/>
@@ -11852,7 +11928,7 @@ license:CC0
 	<software name="headheela" cloneof="headheel">
 		<description>Head Over Heels (set 3)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51082">
 				<rom name="head over heels_tzx120.tzx" size="51082" crc="d52969f8" sha1="6e09d351dc32872f84c2a714b880e4217f6e784a"/>
@@ -11908,7 +11984,7 @@ license:CC0
 	<software name="howrduck">
 		<description>Howard The Duck</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="41763">
 				<rom name="howard the duck.tzx" size="41763" crc="a2d63595" sha1="483d472e84253b5ea8c9da93568c664e3f18e02e"/>
@@ -11919,7 +11995,7 @@ license:CC0
 	<software name="howrduckp" cloneof="howrduck">
 		<description>Howard The Duck (Proein)</description>
 		<year>1987</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<publisher>Proein Soft Line</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="41852">
 				<rom name="howard the duck (proein).tzx" size="41852" crc="0d62e4be" sha1="af7eacf04c9a8f52afce63e653774a528fb99008"/>
@@ -11952,7 +12028,7 @@ license:CC0
 	<software name="hudhawk">
 		<description>Hudson Hawk</description>
 		<year>1991</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="115842">
 				<rom name="hudson hawk.tzx" size="115842" crc="7aee8426" sha1="cde6983f522e6476a42186c67340119ff557afc4"/>
@@ -11963,7 +12039,7 @@ license:CC0
 	<software name="hudhawkhs" cloneof="hudhawk">
 		<description>Hudson Hawk (The Hit Squad)</description>
 		<year>1991</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="114735">
 				<rom name="hudson hawk (the hit squad).tzx" size="114735" crc="fa9a3ef0" sha1="13f5c7aae4cc97d35eb7671cdb30881e600f60e2"/>
@@ -12147,7 +12223,7 @@ license:CC0
 	<software name="hacker">
 		<description>Hacker (set 1, 128k)</description>
 		<year>1985</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="42311">
 				<rom name="hacker - 128k.tzx" size="42311" crc="6b6432ae" sha1="9aeb865a4b473119f9ad77b94ee8c67bac855b4e"/>
@@ -12158,7 +12234,7 @@ license:CC0
 	<software name="hacker48" cloneof="hacker">
 		<description>Hacker (set 2, 48k)</description>
 		<year>1985</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass2" interface="spectrum_cass">
 			<dataarea name="cass" size="42966">
 				<rom name="hacker - 48k.tzx" size="42966" crc="b047071f" sha1="41b8d92d3510a0d2d749f07393edfc8089cd0d9e"/>
@@ -12169,7 +12245,7 @@ license:CC0
 	<software name="hackerp" cloneof="hacker">
 		<description>Hacker (set 3, Proein)</description>
 		<year>1985</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<publisher>Proein Soft Line</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50278">
 				<rom name="hacker (proein).tzx" size="50278" crc="63c26304" sha1="a462eca01ab18a576be83931877f4501726eb6db"/>
@@ -12180,7 +12256,7 @@ license:CC0
 	<software name="hackerr" cloneof="hacker">
 		<description>Hacker (set 4, Ricochet)</description>
 		<year>1985</year>
-		<publisher>Activision Inc / Ricochet</publisher>
+		<publisher>Ricochet</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="40247">
 				<rom name="hacker (ricochet).tzx" size="40247" crc="63d9d66d" sha1="6b7447bdc3a7110775c714bd039836dceb48279c"/>
@@ -12226,7 +12302,7 @@ license:CC0
 	<software name="hacker2">
 		<description>Hacker 2</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="39186">
 				<rom name="hacker 2.tzx" size="39186" crc="9e50dbbf" sha1="d63609ca4fd692a1eb68d202ef1f2962323a15a5"/>
@@ -12248,7 +12324,7 @@ license:CC0
 	<software name="hero">
 		<description>H.E.R.O</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="38131">
 				<rom name="h.e.r.o.tzx" size="38131" crc="8c36c95c" sha1="2d902843bd2ad94662335083c19eb1c03198dc92"/>
@@ -12259,7 +12335,7 @@ license:CC0
 	<software name="highfron">
 		<description>High Frontier</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="30781">
 				<rom name="high frontier.tzx" size="30781" crc="b40a90fe" sha1="1a0ebdf6afeb4cf787d6e726953f5b0af3a3821b"/>
@@ -12270,7 +12346,7 @@ license:CC0
 	<software name="hotrod">
 		<description>Hot Rod</description>
 		<year>1990</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="51980">
 				<rom name="hot rod - side 1.tzx" size="51980" crc="2e14af56" sha1="bd5622e353feb8400c97e87d94805c8c77ad19af"/>
@@ -12401,7 +12477,7 @@ license:CC0
 	<software name="hunchbak">
 		<description>Hunchback (set 1)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="43507">
 				<rom name="hunchback.tzx" size="43507" crc="96725da2" sha1="6f26c42e3e83ebbf65e9271d3cd9908ac9f111f3"/>
@@ -12412,7 +12488,7 @@ license:CC0
 	<software name="hunchbaka" cloneof="hunchbak">
 		<description>Hunchback (set 2)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="43501">
 				<rom name="hunchback - alternate.tzx" size="43501" crc="9b931232" sha1="eb8463e93a514d3696d330e2174b0bb8b0e4323a"/>
@@ -12423,7 +12499,7 @@ license:CC0
 	<software name="hunchadv">
 		<description>Hunchback - The Adventure</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="32154">
 				<rom name="hunchback - the adventure - game.tzx" size="32154" crc="62daf0a8" sha1="a50b68388185a4be5c18c8ebf3f512ef4f29db51"/>
@@ -12449,7 +12525,7 @@ license:CC0
 	<software name="hunchbk2">
 		<description>Hunchback II (set 1)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50505">
 				<rom name="hunchback ii.tzx" size="50505" crc="000dc065" sha1="41bfc4c7a5440d657b7eb8e1a2a47d4b6b4996dd"/>
@@ -12460,7 +12536,7 @@ license:CC0
 	<software name="hunchbk2a" cloneof="hunchbk2">
 		<description>Hunchback II (set 2)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50624">
 				<rom name="hunchback ii - alternate - side a.tzx" size="50624" crc="1d8bafe6" sha1="29d18cc15de3ab0109f51f1e8035c7e5079478d9"/>
@@ -12476,7 +12552,7 @@ license:CC0
 	<software name="hunchbk2z" cloneof="hunchbk2">
 		<description>Hunchback II (set 3, Zafi Chip)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd / Zafi Chip</publisher>
+		<publisher>Zafi Chip</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50505">
 				<rom name="hunchback ii (zafi chip).tzx" size="50505" crc="34122573" sha1="efc2052e582a116790129bef3a3851381ae621c3"/>
@@ -12487,7 +12563,7 @@ license:CC0
 	<software name="hunchbk2b" cloneof="hunchbk2">
 		<description>Hunchback II (set 4)</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50735">
 				<rom name="hunchback ii_tzx120.tzx" size="50735" crc="2f1e26a7" sha1="5ca2c330a1ac7a6058f9bcacf193d53194d7bbdd"/>
@@ -13124,7 +13200,7 @@ license:CC0
 	<software name="offroad">
 		<description>Ivan 'Ironman' Stewart's Super Off Road Racer</description>
 		<year>1990</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50294">
 				<rom name="ivan _ironman_ stewart_s super off road racer.tzx" size="50294" crc="a45b6465" sha1="d28df99313c61adb12364793c098fe879228f597"/>
@@ -13135,7 +13211,7 @@ license:CC0
 	<software name="offroada" cloneof="offroad">
 		<description>Ivan 'Ironman' Stewart's Super Off Road Racer (Tronix)</description>
 		<year>1990</year>
-		<publisher>Virgin Games Ltd / Tronix</publisher>
+		<publisher>Tronix</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50294">
 				<rom name="ivan _ironman_ stewart_s super off road racer (tronix).tzx" size="50294" crc="c5e7e31e" sha1="480408eae6026e781b03990b8367bb23a760e685"/>
@@ -13287,7 +13363,7 @@ license:CC0
 	</software>
 
 	<software name="imatchdy">
-		<description>International Match Day (set 1)</description>
+		<description>International Match Day</description>
 		<year>1985</year>
 		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -13298,9 +13374,9 @@ license:CC0
 	</software>
 
 	<software name="imatchdyer" cloneof="imatchdy">
-		<description>International Match Day (set 2, Erbe / Investronica)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>International Match Day (Investronica)</description>
+		<year>1985</year>
+		<publisher>Investronica</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="100428">
 				<rom name="international match day (erbe).tzx" size="100428" crc="842e7de4" sha1="e6c4ae4d232fdb475623c58df17b1326bf6b2d30"/>
@@ -13309,7 +13385,7 @@ license:CC0
 	</software>
 
 	<software name="imatchdya" cloneof="imatchdy">
-		<description>International Match Day (Set 3)</description>
+		<description>International Match Day (alternate)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -14435,7 +14511,7 @@ license:CC0
 	<software name="knightmr">
 		<description>Knightmare</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="46680">
 				<rom name="knightmare.tzx" size="46680" crc="6e7944de" sha1="04480af2147ff16f01ea2e504ec88ba4134b9f1a"/>
@@ -14446,7 +14522,7 @@ license:CC0
 	<software name="knightmrp" cloneof="knightmr">
 		<description>Knightmare (Proein)</description>
 		<year>1987</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<publisher>Proein Soft Line</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="46762">
 				<rom name="knightmare (proein).tzx" size="46762" crc="6bb61e4f" sha1="5afe78f512cd6edf3fe4b9af77a18605def64679"/>
@@ -14457,7 +14533,7 @@ license:CC0
 	<software name="knightmrr" cloneof="knightmr">
 		<description>Knightmare (Ricochet)</description>
 		<year>1987</year>
-		<publisher>Activision Inc / Ricochet</publisher>
+		<publisher>Ricochet</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="46312">
 				<rom name="knightmare (ricochet).tzx" size="46312" crc="713b08fd" sha1="b5e53e90f1162745320b05ea3e7559d7815b659c"/>
@@ -14479,7 +14555,7 @@ license:CC0
 	<software name="koronis">
 		<description>Koronis Rift (set 1)</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="59041">
 				<rom name="koronis rift - alternate - side a.tzx" size="59041" crc="6dbf7ed1" sha1="d156a414aa99c045ef43530d416a6409f89e73d8"/>
@@ -14495,7 +14571,7 @@ license:CC0
 	<software name="koronisa" cloneof="koronis"> <!-- all data on one side? -->
 		<description>Koronis Rift (Set 2)</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="98057">
 				<rom name="koronis rift.tzx" size="98057" crc="dfc2eb28" sha1="09d5c2598710b3bbdcfcc9feef2560c3076db7a0"/>
@@ -14657,7 +14733,7 @@ license:CC0
 	<software name="klax">
 		<description>Klax</description>
 		<year>1990</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="131532">
 				<rom name="klax.tzx" size="131532" crc="5abcf9fd" sha1="3fc1a2cb39f8df7697bd0b159bdb44df6e239cba"/>
@@ -14668,7 +14744,7 @@ license:CC0
 	<software name="klaxhs" cloneof="klax">
 		<description>Klax (The Hit Squad)</description>
 		<year>1990</year>
-		<publisher>Domark Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="131520">
 				<rom name="klax (the hit squad).tzx" size="131520" crc="70232f58" sha1="8a4f81aeedf55a78a05f0d6cfb43a2d5b2d67bd1"/>
@@ -14679,7 +14755,7 @@ license:CC0
 	<software name="klaxe" cloneof="klax">
 		<description>Klax (Erbe)</description>
 		<year>1990</year>
-		<publisher>Domark Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="134675">
 				<rom name="klax (erbe).tzx" size="134675" crc="74299454" sha1="2a3c574d674a8d1ea4f7adcd9b055ee8f0588bf9"/>
@@ -15385,7 +15461,7 @@ license:CC0
 	<software name="lcp">
 		<description>Little Computer People</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="139025">
 				<rom name="little computer people.tzx" size="139025" crc="5031ccbd" sha1="1c910d4264738f5a7609eaf6fde144556b5279b8"/>
@@ -15651,7 +15727,7 @@ license:CC0
 	<software name="lotus">
 		<description>Lotus Esprit Turbo Challenge</description>
 		<year>1990</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="94151">
 				<rom name="lotus esprit turbo challenge - side 1.tzx" size="94151" crc="304c9224" sha1="851c682ad55014981c8bb227569f3af0c06596df"/>
@@ -16554,7 +16630,7 @@ license:CC0
 	<software name="mndshadw">
 		<description>Mind Shadow (set 1)</description>
 		<year>1985</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="124128">
 				<rom name="mind shadow - side a.tzx" size="124128" crc="25a0317f" sha1="fd60910743c8b31894a35163ceea0fdff9487691"/>
@@ -16837,7 +16913,7 @@ license:CC0
 	<software name="mario">
 		<description>Mario Bros (set 1)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="45160">
 				<rom name="mario bros.tzx" size="45160" crc="e631869e" sha1="fe808995d64d76bf07d0697848a14406afe172f6"/>
@@ -16848,7 +16924,7 @@ license:CC0
 	<software name="marioa" cloneof="mario">
 		<description>Mario Bros (set 2, Spectrum +2)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="57685">
 				<rom name="mario bros +2.tzx" size="57685" crc="bbf825a9" sha1="38478575ab9f6bca8bbd7dd09e22fa90a9e46a46"/>
@@ -16859,7 +16935,7 @@ license:CC0
 	<software name="mariob" cloneof="mario">
 		<description>Mario Bros (Erbe)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="42512">
 				<rom name="mario bros (erbe).tzx" size="42512" crc="726e5003" sha1="a53f8ab7a6b6c9155e0e2c18e721a4b8beba88e4"/>
@@ -16881,7 +16957,7 @@ license:CC0
 	<software name="marioc" cloneof="mario">
 		<description>Mario Bros (set 4)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="45913">
 				<rom name="mario bros_tzx120.tzx" size="45913" crc="48a91698" sha1="d44d8c71e288727ba8e13d41596ab81bbd650fc0"/>
@@ -16893,7 +16969,7 @@ license:CC0
 	<software name="midres">
 		<description>Midnight Resistance</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="131656">
 				<rom name="midnight resistance - 128k.tzx" size="131656" crc="626562b4" sha1="2ffc267f9b8d9ff236de7384043f674ae6140b4e"/>
@@ -16909,7 +16985,7 @@ license:CC0
 	<software name="midreshs" cloneof="midres">
 		<description>Midnight Resistance (The Hit Squad)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="131971">
 				<rom name="midnight resistance - 128k (the hit squad).tzx" size="131971" crc="db438300" sha1="a3e610281d883af7adf1a6af4c333d1253331c1d"/>
@@ -16925,7 +17001,7 @@ license:CC0
 	<software name="midrese" cloneof="midres">
 		<description>Midnight Resistance (Erbe)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="127159">
 				<rom name="midnight resistance - side 1 (erbe).tzx" size="127159" crc="709bd1f8" sha1="adf8078bd452c8477677d6d646a984d18c7fa936"/>
@@ -17049,7 +17125,7 @@ license:CC0
 	<software name="mrwimpy">
 		<description>Mr Wimpy</description>
 		<year>1984</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="34941">
 				<rom name="mr wimpy.tzx" size="34941" crc="1353dba1" sha1="24bba0cdb1e6ea41131b75ef5a3cfcd2ac21b580"/>
@@ -17137,7 +17213,7 @@ license:CC0
 	<software name="miamiv">
 		<description>Miami Vice</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50155">
 				<rom name="miami vice.tzx" size="50155" crc="05ef644e" sha1="e6b1d3280591c297b61fd89a25d6cd09291f2649"/>
@@ -17148,7 +17224,7 @@ license:CC0
 	<software name="miamivhs" cloneof="miamiv">
 		<description>Miami Vice (The Hit Squad)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="55982">
 				<rom name="miami vice (the hit squad).tzx" size="55982" crc="b82b5364" sha1="0e434062c646a93364cb2ac077316571af582059"/>
@@ -17159,7 +17235,7 @@ license:CC0
 	<software name="miamiver" cloneof="miamiv">
 		<description>Miami Vice (Erbe)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51232">
 				<rom name="miami vice (erbe).tzx" size="51232" crc="4879b517" sha1="a90f1866963d96c10f6fdf32c48c30b2869fa9fb"/>
@@ -17179,7 +17255,7 @@ license:CC0
 	</software>
 
 	<software name="matchday">
-		<description>Match Day (set 1)</description>
+		<description>Match Day</description>
 		<year>1984</year>
 		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -17189,10 +17265,21 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="matchdayhs" cloneof="matchday">
-		<description>Match Day (set 2, The Hit Squad)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="matchdaya" cloneof="matchday">
+		<description>Match Day (IBSA)</description>
+		<year>1990</year>
+		<publisher>IBSA</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="47999">
+				<rom name="Match Day (IBSA - The Hit Squad).tzx" size="47999" crc="97097d89" sha1="3c2d8d88447e5a358d0ee5eca80ac8a7d5835624"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="matchdayb" cloneof="matchday">
+		<description>Match Day (The Hit Squad)</description>
+		<year>1990</year>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49979">
 				<rom name="match day (the hit squad).tzx" size="49979" crc="55812a53" sha1="c5dd7a55c5087363c9ad87db51c9e81d0bd8bafe"/>
@@ -17200,10 +17287,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="matchdayza" cloneof="matchday">
-		<description>Match Day (set 3, Zafiro)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="matchdayc" cloneof="matchday">
+		<description>Match Day (Zafiro)</description>
+		<year>1985</year>
+		<publisher>Zafiro</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50113">
 				<rom name="match day (zafiro).tzx" size="50113" crc="f6f18874" sha1="e7b6501f541c9f1b647462bf148ce5636a57ec96"/>
@@ -17211,8 +17298,8 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="matchdayhsa" cloneof="matchday">
-		<description>Match Day (set 4, The Hit Squad)</description>
+	<software name="matchdayd" cloneof="matchday">
+		<description>Match Day (The Hit Squad, alternate)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -17222,10 +17309,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="matchdayzaa" cloneof="matchday">
-		<description>Match Day (set 5, Zafiro)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="matchdaye" cloneof="matchday">
+		<description>Match Day (Zafiro, alternate)</description>
+		<year>1985</year>
+		<publisher>Zafiro</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50590">
 				<rom name="match day (zafiro)_tzx120.tzx" size="50590" crc="948e774a" sha1="6d62a25b0df068ab2918c5d9c79d80222d2a5af8"/>
@@ -17233,8 +17320,8 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="matchdaya" cloneof="matchday">
-		<description>Match Day (set 6)</description>
+	<software name="matchdayf" cloneof="matchday">
+		<description>Match Day (alternate)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -17867,7 +17954,7 @@ license:CC0
 	<software name="norstar">
 		<description>North Star</description>
 		<year>1988</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49698">
 				<rom name="northstar.tzx" size="49698" crc="04f03cc8" sha1="7eadc832d0fd3446e5e2aea5a259dd9805a157ac"/>
@@ -17988,7 +18075,7 @@ license:CC0
 	<software name="tnzs">
 		<description>The New Zealand Story</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="200590">
 				<rom name="the new zealand story - side 1.tzx" size="200590" crc="643231a6" sha1="5db9846c6ea762c497acee3b5c97540c7f97f580"/>
@@ -18004,7 +18091,7 @@ license:CC0
 	<software name="tnzse" cloneof="tnzs">
 		<description>The New Zealand Story (Erbe)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="52491">
 				<rom name="the new zealand story - side 1 (erbe).tzx" size="52491" crc="6315ce35" sha1="2112468ccb9d50cd28986ccfe9926262ed4cd0bc"/>
@@ -18020,7 +18107,7 @@ license:CC0
 	<software name="tnzshs" cloneof="tnzs"> <!-- all data on one side -->
 		<description>The New Zealand Story (The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="200855">
 				<rom name="the new zealand story (the hit squad).tzx" size="200855" crc="fa56116b" sha1="1fe5c8553239cb6f7785608b614ef26530b0caee"/>
@@ -18031,7 +18118,7 @@ license:CC0
 	<software name="nspirit">
 		<description>Ninja Spirit</description>
 		<year>1990</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="52604">
 				<rom name="ninja spirit - side a.tzx" size="52604" crc="8881723d" sha1="d728b56eeff5e043cc7012d7a0ee05ee2841c5d1"/>
@@ -18047,7 +18134,7 @@ license:CC0
 	<software name="nspiritm" cloneof="nspirit">
 		<description>Ninja Spirit (MCM)</description>
 		<year>1990</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="52508">
 				<rom name="ninja spirit - side 1 (mcm).tzx" size="52508" crc="6c64f033" sha1="8e58719f7bf9e887598f8e6e262d62e18c9440fc"/>
@@ -18104,7 +18191,7 @@ license:CC0
 	<software name="ninjaw">
 		<description>Ninja Warriors</description>
 		<year>1989</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="65480">
 				<rom name="ninja warriors - side a.tzx" size="65480" crc="eae6c4aa" sha1="f379f7254412c73aa3ac43847269f15fe7075cd8"/>
@@ -18120,7 +18207,7 @@ license:CC0
 	<software name="ninjawt" cloneof="ninjaw">
 		<description>Ninja Warriors (Tronix)</description>
 		<year>1989</year>
-		<publisher>Virgin Games Ltd / Tronix</publisher>
+		<publisher>Tronix</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="65473">
 				<rom name="ninja warriors - side a (tronix).tzx" size="65473" crc="ecb21338" sha1="71739859d73fb163f75a7edf519f8521918345c8"/>
@@ -18804,7 +18891,7 @@ license:CC0
 	<software name="opwolf">
 		<description>Operation Wolf</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="135695">
 				<rom name="operation wolf - 128k.tzx" size="135695" crc="30ebe14c" sha1="b436e95d98d0cbc3824e3962758261f59a4ac537"/>
@@ -18820,7 +18907,7 @@ license:CC0
 	<software name="opwolfhs" cloneof="opwolf">
 		<description>Operation Wolf (The Hit Squad)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="136451">
 				<rom name="operation wolf - 128k (the hit squad).tzx" size="136451" crc="50d0966f" sha1="e55f1dc70523d8ea27398a3f0752b5b195e6f6e7"/>
@@ -18836,7 +18923,7 @@ license:CC0
 	<software name="opwolfer" cloneof="opwolf">
 		<description>Operation Wolf (Erbe) (set 1)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="131475">
 				<rom name="operation wolf - side 1 (erbe).tzx" size="131475" crc="068f4712" sha1="0b76411bf9ea145fb01431141b4e8682715a56db"/>
@@ -18852,7 +18939,7 @@ license:CC0
 	<software name="opwolfera" cloneof="opwolf"> <!-- was this a single format release, or just missing a side in the dump? -->
 		<description>Operation Wolf (Erbe) (set 2)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="131256">
 				<rom name="operation wolf (erbe).tzx" size="131256" crc="2910d4ac" sha1="3af20b717bfece5d44977c73d3e4c83b749d119c"/>
@@ -19551,7 +19638,7 @@ license:CC0
 	<software name="pang">
 		<description>Pang</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<feature name="part_id" value="Side 1 - Game"/>
 			<dataarea name="cass" size="64525">
@@ -19566,6 +19653,24 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="panga" cloneof="pang">
+		<description>Pang (Erbe)</description>
+		<year>1990</year>
+		<publisher>Erbe Software</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<feature name="part_id" value="Side 1 - Game"/>
+			<dataarea name="cass" size="67987">
+				<rom name="Pang - Side 1 (Erbe).tzx" size="67987" crc="c49eefd5" sha1="6b4b0c37d9fdd3cacb2d79532affb21209068d00"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<feature name="part_id" value="Side 1 - Levels"/>
+			<dataarea name="cass" size="39916">
+				<rom name="Pang - Side 2 (Erbe).tzx" size="39916" crc="f57b4d14" sha1="62ed9310fd65a563eb3e95a146080b1e5b57390d"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- on tape twice -->
 	<software name="pssst">
 		<description>Pssst</description>
@@ -19716,11 +19821,21 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="pitfall">
+		<description>Pitfall</description>
+		<year>1983</year>
+		<publisher>Infinite Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="67654">
+				<rom name="pitfall (infinite software).tzx" size="67654" crc="72bfe48b" sha1="f83ee33b110c1b5e6253299dcac7c482908bb648"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="pitfall2">
 		<description>Pitfall II - Lost Caverns</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="27352">
 				<rom name="pitfall ii.tzx" size="27352" crc="224f96a0" sha1="57dcb71b948d907a45f1fdc98fe820bcd0817e1f"/>
@@ -19796,7 +19911,7 @@ license:CC0
 	<software name="pdrift">
 		<description>Power Drift</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="137760">
 				<rom name="power drift - side 1.tzx" size="137760" crc="3c537f8c" sha1="3ae3aea138af2d18b6f75c3955e73d700dadab3b"/>
@@ -19812,7 +19927,7 @@ license:CC0
 	<software name="pdrifta" cloneof="pdrift">
 		<description>Power Drift (set 2)</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="137998">
 				<rom name="power drift - alternate - side 1.tzx" size="137998" crc="7456e743" sha1="9e02cb0ac8f520f84b135d15c8891f96e6fc2561"/>
@@ -19828,7 +19943,7 @@ license:CC0
 	<software name="pdrifths" cloneof="pdrift"> <!-- all data on a single side -->
 		<description>Power Drift (set 3, The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="179684">
 				<rom name="power drift (the hit squad).tzx" size="179684" crc="c07d8fb2" sha1="708ac04d98ad8d4b58d5b938a614447ed62c18fa"/>
@@ -19836,12 +19951,10 @@ license:CC0
 		</part>
 	</software>
 
-
-
 	<software name="pred">
-		<description>Predator (Set 1)</description>
+		<description>Predator</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="197732">
 				<rom name="predator.tzx" size="197732" crc="55ae019d" sha1="181615acc16670f420fcc3dae651189459c06c68"/>
@@ -19849,10 +19962,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="prede">
-		<description>Predator (set 2, Erbe / The Hit Squad)</description>
-		<year>1987</year>
-		<publisher>Activision Inc / Erbe / The Hit Squad</publisher>
+	<software name="prede" cloneof="pred">
+		<description>Predator (IBSA)</description>
+		<year>1989</year>
+		<publisher>IBSA</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="197562">
 				<rom name="predator (erbe - the hit squad).tzx" size="197562" crc="1a4012e1" sha1="5fb434ae72ac517b090a0b3d2c46e5dc02f06489"/>
@@ -19861,9 +19974,9 @@ license:CC0
 	</software>
 
 	<software name="predp" cloneof="pred">
-		<description>Predator (set 3, Proein)</description>
-		<year>1987</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<description>Predator (Proein)</description>
+		<year>1988</year>
+		<publisher>Proein Soft Line</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="197700">
 				<rom name="predator (proein).tzx" size="197700" crc="8c5e8816" sha1="3c0d83d535b1a6c500913e56b7b2704e10d74363"/>
@@ -19872,9 +19985,9 @@ license:CC0
 	</software>
 
 	<software name="predhs" cloneof="pred">
-		<description>Predator (set 4, The Hit Squad)</description>
-		<year>1987</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<description>Predator (The Hit Squad)</description>
+		<year>1990</year>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="202670">
 				<rom name="predator - side 1 (the hit squad).tzx" size="202670" crc="42076f63" sha1="718919e77e2079ac9812a4b7fa5b3aca66756550"/>
@@ -19906,7 +20019,7 @@ license:CC0
 	<software name="pred2m" cloneof="pred2">
 		<description>Predator 2 (MCM)</description>
 		<year>1991</year>
-		<publisher>Image Works / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="25020">
 				<rom name="predator 2 - side 1 (mcm).tzx" size="25020" crc="bb99e7a5" sha1="bbb6ff31dd3608b66f654f10476f0ad8d4e88bbc"/>
@@ -20020,7 +20133,7 @@ license:CC0
 	<software name="puzznic">
 		<description>Puzznic</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="39252">
 				<rom name="puzznic.tzx" size="39252" crc="fada4e2c" sha1="765a2a4adfb0dc33b0120516d6dd963cb451dc00"/>
@@ -20031,7 +20144,7 @@ license:CC0
 	<software name="puzznice" cloneof="puzznic">
 		<description>Puzznic (Erbe)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="40816">
 				<rom name="puzznic (erbe).tzx" size="40816" crc="0e442755" sha1="28059355e318ef5aa2fdb4ae00cf492378252c68"/>
@@ -20042,7 +20155,7 @@ license:CC0
 	<software name="puzznichs" cloneof="puzznic">
 		<description>Puzznic (The Hit Squad)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="39288">
 				<rom name="puzznic (the hit squad).tzx" size="39288" crc="d6ae3351" sha1="3dcbbf7e2af0a0d23395892d0521c4f01c71f0c8"/>
@@ -20054,7 +20167,7 @@ license:CC0
 	<software name="plotting">
 		<description>Plotting</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="53772">
 				<rom name="plotting.tzx" size="53772" crc="13c03985" sha1="d818b99567ceb5891377340c38d947cf2b20733d"/>
@@ -20065,7 +20178,7 @@ license:CC0
 	<software name="plottinge" cloneof="plotting">
 		<description>Plotting (Erbe)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="55525">
 				<rom name="plotting (erbe).tzx" size="55525" crc="6710f00e" sha1="05703a2c9fb36ae96b4a6405ce2c1af8db6d380e"/>
@@ -20963,7 +21076,7 @@ license:CC0
 	<software name="quartet">
 		<description>Quartet (set 1)</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49952">
 				<rom name="quartet.tzx" size="49952" crc="8146fef8" sha1="11abd08d52b9488b56181b3183b51a4027ce1d96"/>
@@ -20974,7 +21087,7 @@ license:CC0
 	<software name="quarteths" cloneof="quartet">
 		<description>Quartet (set 2, The Hit Squad)</description>
 		<year>1987</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50113">
 				<rom name="quartet (the hit squad).tzx" size="50113" crc="c4f36b27" sha1="0717d897a3ef3f0c853d043dbdc93f93abe6a52d"/>
@@ -20985,7 +21098,7 @@ license:CC0
 	<software name="quarteta" cloneof="quartet">
 		<description>Quartet (set 3)</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50502">
 				<rom name="quartet_tzx120.tzx" size="50502" crc="b442077b" sha1="3635042e984f1be492bb8224b5e873880b702506"/>
@@ -21305,7 +21418,7 @@ license:CC0
 	<software name="rbisland">
 		<description>Rainbow Islands (set 1)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<feature name="part_id" value="Side 1"/>
 			<dataarea name="cass" size="94678">
@@ -21320,10 +21433,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="rbislander" cloneof="rbisland">
-		<description>Rainbow Islands (set 2, Erbe)</description>
+	<software name="rbislanda" cloneof="rbisland">
+		<description>Rainbow Islands (Erbe)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<feature name="part_id" value="Side 1"/>
 			<dataarea name="cass" size="97295">
@@ -21337,11 +21450,41 @@ license:CC0
 			</dataarea>
 		</part>
 	</software>
-
-	<software name="rbislandhs" cloneof="rbisland">
-		<description>Rainbow Islands (set 3, The Hit Squad)</description>
+	
+	<software name="rbislandb" cloneof="rbisland">
+		<description>Rainbow Islands (Erbe, small case)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>Erbe Software</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<feature name="part_id" value="Side 1"/>
+			<dataarea name="cass" size="97319">
+				<rom name="Rainbow Islands - Small Case - Side 1 (Erbe).tzx" size="97319" crc="b9e9c9e1" sha1="154a59d6844be72359f3f508f964efaab63ed780"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<feature name="part_id" value="Side 2"/>
+			<dataarea name="cass" size="59236">
+				<rom name="Rainbow Islands - Small Case - Side 2 (Erbe).tzx" size="59236" crc="eca52095" sha1="7c26bd6ebf3ac9c88c0a3d5f8aa48f4ea08ca83d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rbislandc" cloneof="rbisland">
+		<description>Rainbow Islands (Musical 1)</description>
+		<year>1990</year>
+		<publisher>Musical 1</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<feature name="part_id" value="Side 1"/>
+			<dataarea name="cass" size="97222">
+				<rom name="Rainbow Islands (Musical 1 - The Hit Squad).tzx" size="97222" crc="9d715df4" sha1="05d5fd76fb1a9f4c5f7cce8844d630c56f824e6f"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rbislandd" cloneof="rbisland">
+		<description>Rainbow Islands (The Hit Squad)</description>
+		<year>1990</year>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<feature name="part_id" value="Side 1"/>
 			<dataarea name="cass" size="94710">
@@ -21356,10 +21499,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="rbislanda" cloneof="rbisland">
-		<description>Rainbow Islands (set 4)</description>
+	<software name="rbislande" cloneof="rbisland">
+		<description>Rainbow Islands (alternative)</description>
 		<year>1990</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="94689">
 				<rom name="rainbow islands - side 1_tzx120.tzx" size="94689" crc="22cc606a" sha1="f3cee64c92ea00fb5a2dfefd5fdd1fa93a553c15"/>
@@ -21654,7 +21797,7 @@ license:CC0
 	<software name="rivraid">
 		<description>River Raid</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47342">
 				<rom name="river raid.tzx" size="47342" crc="7f720cb3" sha1="b5362e58a6f3a8801f98baaa1df80eeca06b3eb1"/>
@@ -21676,7 +21819,7 @@ license:CC0
 	<software name="rfractal">
 		<description>Rescue On Fractalus (set 1)</description>
 		<year>1986</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="42816">
 				<rom name="rescue on fractalus.tzx" size="42816" crc="3b7feac3" sha1="84938a3f4c3ac3c411ec24c96be0d0cc00dea181"/>
@@ -21710,7 +21853,7 @@ license:CC0
 	<software name="rampage">
 		<description>Rampage</description>
 		<year>1988</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="45850">
 				<rom name="rampage.tzx" size="45850" crc="6dfe9a52" sha1="3301f7659b74d9159f6b4a91bce397f134f0559a"/>
@@ -21721,7 +21864,7 @@ license:CC0
 	<software name="rampagehs" cloneof="rampage">
 		<description>Rampage (The Hit Squad)</description>
 		<year>1988</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49729">
 				<rom name="rampage (the hit squad).tzx" size="49729" crc="6ab52fb4" sha1="d8d098c4a5f5042687e49bc91564809de692f0d6"/>
@@ -21836,7 +21979,7 @@ license:CC0
 	<software name="jedi">
 		<description>Return Of The Jedi</description>
 		<year>1989</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="40755">
 				<rom name="return of the jedi.tzx" size="40755" crc="b6c903b1" sha1="eb1996365a90d81ad7518a68ab0db8f4a5e57f55"/>
@@ -21858,7 +22001,7 @@ license:CC0
 	<software name="jedihs" cloneof="jedi">
 		<description>Return Of The Jedi (The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Domark Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="40761">
 				<rom name="return of the jedi (the hit squad).tzx" size="40761" crc="77be464d" sha1="1c6abf7fdd7407b0105333ea820f6093e09257f5"/>
@@ -22200,7 +22343,7 @@ license:CC0
 	<software name="rambo">
 		<description>Rambo (set 1)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="45769">
 				<rom name="rambo.tzx" size="45769" crc="2c669567" sha1="b972307b7ee5fb0786ac354e605beca34ac19b99"/>
@@ -22211,7 +22354,7 @@ license:CC0
 	<software name="rambohs" cloneof="rambo">
 		<description>Rambo (set 2, The Hit Squad)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="52533">
 				<rom name="rambo (the hit squad).tzx" size="52533" crc="af8e7562" sha1="40391854eb1298fa7094e663a71ea74533744d5d"/>
@@ -22222,7 +22365,7 @@ license:CC0
 	<software name="ramboer" cloneof="rambo">
 		<description>Rambo (set 3, Erbe)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50517">
 				<rom name="rambo (erbe).tzx" size="50517" crc="dc2434c5" sha1="7c408d45f8b5c9100a7820e669e70f7c52da9a84"/>
@@ -22233,7 +22376,7 @@ license:CC0
 	<software name="ramboera" cloneof="rambo">
 		<description>Rambo (set 4, Erbe - Serie Leyenda)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50667">
 				<rom name="rambo (erbe - serie leyenda).tzx" size="50667" crc="0e99b603" sha1="1ec3407f1897855b1a3d8e09784e359cff4572dc"/>
@@ -22244,7 +22387,7 @@ license:CC0
 	<software name="rambob" cloneof="rambo">
 		<description>Rambo (set 5)</description>
 		<year>1985</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="45376">
 				<rom name="rambo_tzx120.tzx" size="45376" crc="ab477acc" sha1="80daf5622abc257272669cc321adc24308d2c762"/>
@@ -23336,7 +23479,7 @@ license:CC0
 	<software name="silkworm">
 		<description>Silkworm</description>
 		<year>1989</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="56227">
 				<rom name="silk worm.tzx" size="56227" crc="034b3643" sha1="fab832f66fb5d3a466e4a55eba9fc9d5f7792440"/>
@@ -23347,7 +23490,7 @@ license:CC0
 	<software name="silkworme" cloneof="silkworm">
 		<description>Silkworm (Erbe)</description>
 		<year>1989</year>
-		<publisher>Virgin Games Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="56977">
 				<rom name="silk worm (erbe).tzx" size="56977" crc="fd5e309e" sha1="9a7785b078fff49ba70b6f10fb8878b2dccac1ef"/>
@@ -23358,7 +23501,7 @@ license:CC0
 	<software name="silkwormm" cloneof="silkworm">
 		<description>Silkworm (Mastertronic Plus)</description>
 		<year>1989</year>
-		<publisher>Virgin Games Ltd / Mastertronic Plus</publisher>
+		<publisher>Mastertronic Plus</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="56227">
 				<rom name="silk worm (mastertronic plus).tzx" size="56227" crc="723dcd55" sha1="0e07f99aad9f89667f850dd9eae74db07455fda6"/>
@@ -23369,7 +23512,7 @@ license:CC0
 	<software name="silkwormt" cloneof="silkworm">
 		<description>Silkworm (Tronix)</description>
 		<year>1989</year>
-		<publisher>Virgin Games Ltd / Tronix</publisher>
+		<publisher>Tronix</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="56393">
 				<rom name="silk worm (tronix).tzx" size="56393" crc="15141093" sha1="b977450d9c9ef5d139706603c1a47a3ea7b578bb"/>
@@ -23467,7 +23610,7 @@ license:CC0
 	<software name="splitimg">
 		<description>Splitting Images</description>
 		<year>1986</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50130">
 				<rom name="splitting images.tzx" size="50130" crc="d970901c" sha1="a0cbef114b3ac20092f9806eb976a3df3b07ab77"/>
@@ -23479,7 +23622,7 @@ license:CC0
 	<software name="splitper" cloneof="splitimg">
 		<description>Split Personalities</description>
 		<year>1986</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50213">
 				<rom name="split personalities - side 1.tzx" size="50213" crc="e069e0dc" sha1="002281ad9d4d708368bc57174c1eade888ab0690"/>
@@ -23892,7 +24035,7 @@ license:CC0
 	<software name="spcshut">
 		<description>Space Shuttle - A Journey into Space (Activision)</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="28605">
 				<rom name="space shuttle (activision).tzx" size="28605" crc="4f0438db" sha1="2a751e6a1d19eeecad35c43c9e5c93bd90b0d525"/>
@@ -23955,7 +24098,7 @@ license:CC0
 	<software name="sailing">
 		<description>Sailing</description>
 		<year>1987</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="39702">
 				<rom name="sailing.tzx" size="39702" crc="59ee15b5" sha1="79cc240e70b80bd9b94ecc076ced701011f44458"/>
@@ -23966,7 +24109,7 @@ license:CC0
 	<software name="sailingp" cloneof="sailing">
 		<description>Sailing (Proein)</description>
 		<year>1987</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<publisher>Proein Soft Line</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="39981">
 				<rom name="sailing (proein).tzx" size="39981" crc="a2ed335d" sha1="9d97a405e1f009f9b27b3bd4d5565941edf6392d"/>
@@ -23988,7 +24131,7 @@ license:CC0
 	<software name="sdi">
 		<description>SDI - Strategic Defence Initiative</description>
 		<year>1988</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48081">
 				<rom name="sdi - strategic defence initiative.tzx" size="48081" crc="9dd91929" sha1="18f5c0ff80ae6cf05915c9a97fe691c7651a277f"/>
@@ -23999,7 +24142,7 @@ license:CC0
 	<software name="sdihs" cloneof="sdi">
 		<description>SDI - Strategic Defence Initiative (The Hit Squad)</description>
 		<year>1988</year>
-		<publisher>Activision Inc / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="41284">
 				<rom name="sdi - strategic defence initiative (the hit squad).tzx" size="41284" crc="e8237d2e" sha1="5b4a093463c5ec473d184cce7474d31e30bb091d"/>
@@ -24100,7 +24243,7 @@ license:CC0
 	<software name="sonicbom">
 		<description>Sonic Boom</description>
 		<year>1990</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="36744">
 				<rom name="sonic boom - game.tzx" size="36744" crc="017c9c88" sha1="23cc04344b1f290591c61a7ee33810b1995e3443"/>
@@ -24116,7 +24259,7 @@ license:CC0
 	<software name="wbml">
 		<description>Super Wonder Boy (Wonder Boy in Monster Land)</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="59199">
 				<rom name="super wonder boy - side 1.tzx" size="59199" crc="fe699ce8" sha1="63aba0e7aac695865e2ab649b87455aef3f32b5a"/>
@@ -24132,7 +24275,7 @@ license:CC0
 	<software name="wbmlm" cloneof="wbml">
 		<description>Super Wonder Boy (Wonder Boy in Monster Land) (MCM)</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="53963">
 				<rom name="super wonder boy - side 1 (mcm).tzx" size="53963" crc="52bed27a" sha1="d03037257bcd8337e3ae88c62e62053351c00548"/>
@@ -24460,7 +24603,7 @@ license:CC0
 	<software name="scircuit">
 		<description>Short Circuit (set 1)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="95033">
 				<rom name="short circuit - 48k.tzx" size="95033" crc="e8e3af46" sha1="c0a4ba8759b7a51a0c5dfff5d9c731c428c8c561"/>
@@ -24476,7 +24619,7 @@ license:CC0
 	<software name="scircuiths" cloneof="scircuit">
 		<description>Short Circuit (set 2, The Hit Squad)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="100869">
 				<rom name="short circuit - 48k (the hit squad).tzx" size="100869" crc="d8c114ae" sha1="8a814f1aa93cebd83cb1bb402343ed7e737a5bbb"/>
@@ -24492,7 +24635,7 @@ license:CC0
 	<software name="scircuite" cloneof="scircuit">
 		<description>Short Circuit (set 3, Erbe)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="91298">
 				<rom name="short circuit - side 1 (erbe).tzx" size="91298" crc="71088e57" sha1="4b564601c82d317d90f5f5e382c9f2573c6c02f0"/>
@@ -24508,7 +24651,7 @@ license:CC0
 	<software name="scircuita" cloneof="scircuit">
 		<description>Short Circuit (set 4)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="96271">
 				<rom name="short circuit - 48k_tzx120.tzx" size="96271" crc="a6956372" sha1="0f9671cf66a90ac49a082e53bb942c56872183ab"/>
@@ -24705,7 +24848,7 @@ license:CC0
 	<software name="starwars">
 		<description>Star Wars (release 2)</description>
 		<year>1987</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="71501">
 				<rom name="star wars - release 2.tzx" size="71501" crc="7b57764c" sha1="044d0fc7391d26a24c74e30808687f138d4d5b67"/>
@@ -24716,7 +24859,7 @@ license:CC0
 	<software name="starwarsa" cloneof="starwars">
 		<description>Star Wars (release 1)</description>
 		<year>1987</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="69258">
 				<rom name="star wars - release 1 - side 1.tzx" size="69258" crc="14554159" sha1="2048a0b256dd5c562df24f8694bf2dfa62bc36c0"/>
@@ -24732,7 +24875,7 @@ license:CC0
 	<software name="starwarshs" cloneof="starwars">
 		<description>Star Wars (The Hit Squad)</description>
 		<year>1987</year>
-		<publisher>Domark Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="58269">
 				<rom name="star wars (the hit squad).tzx" size="58269" crc="cd98a1cb" sha1="97059fb0ba731d7eeb3179224cd4ae139692988f"/>
@@ -25033,9 +25176,9 @@ license:CC0
 	</software>
 
 	<software name="bartvssm">
-		<description>The Simpsons - Bart Vs The Space Mutants</description>
+		<description>The Simpsons: Bart vs. the Space Mutants</description>
 		<year>1991</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="172169">
 				<rom name="simpsons - bart vs the space mutants - side 1.tzx" size="172169" crc="5ffbe934" sha1="54cc020b72656b03663b34d66e475b901868131d"/>
@@ -25049,9 +25192,9 @@ license:CC0
 	</software>
 
 	<software name="bartvssmer" cloneof="bartvssm">
-		<description>The Simpsons - Bart Vs The Space Mutants (Erbe)</description>
+		<description>The Simpsons: Bart vs. the Space Mutants (Erbe)</description>
 		<year>1991</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="167192">
 				<rom name="simpsons - bart vs the space mutants - side 1 (erbe).tzx" size="167192" crc="640ed1ca" sha1="ba079b88449d62d3ba21beae3ed595653a3cfce9"/>
@@ -25065,9 +25208,9 @@ license:CC0
 	</software>
 
 	<software name="bartvssmhs" cloneof="bartvssm">
-		<description>The Simpsons - Bart Vs The Space Mutants (The Hit Squad)</description>
+		<description>The Simpsons: Bart vs. the Space Mutants (The Hit Squad)</description>
 		<year>1991</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="172046">
 				<rom name="simpsons - bart vs the space mutants - side 1 (the hit squad).tzx" size="172046" crc="9149db99" sha1="01389a9ece5a21a70f8c26b957163ba6a0e2c8e4"/>
@@ -25483,8 +25626,8 @@ license:CC0
 
 	<software name="samfox48" cloneof="samfox">
 		<description>Samantha Fox Strip Poker (set 2, 48k, with 7 Card Stud)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1986</year>
+		<publisher>Martech Games</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="49406">
 				<rom name="samantha fox strip poker - 48k - side a.tzx" size="49406" crc="b5cebe66" sha1="ddb8b2006d44b902ab04b6a10bcde7797fd19140"/>
@@ -25499,8 +25642,8 @@ license:CC0
 
 	<software name="samfoxmp" cloneof="samfox" supported="no"> <!-- main game doesn't load -->
 		<description>Samantha Fox Strip Poker (set 3, 48k, Micropool, with 7 Card Stud)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1986</year>
+		<publisher>Micropool</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="49375">
 				<rom name="samantha fox strip poker (micropool) - side a.tzx" size="49375" crc="bf1a0a60" sha1="d86d389a6e50d37a5a20ac2be52cb74928b4136e"/>
@@ -25515,8 +25658,8 @@ license:CC0
 
 	<software name="samfoxre" cloneof="samfox">
 		<description>Samantha Fox Strip Poker (set 4, 48k, React)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1986</year>
+		<publisher>React</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47088">
 				<rom name="samantha fox strip poker (react).tzx" size="47088" crc="2aec6357" sha1="299b8735c525b071bbb4eb067418789a43e10af1"/>
@@ -25526,8 +25669,8 @@ license:CC0
 
 	<software name="samfoxed" cloneof="samfox">
 		<description>Samantha Fox Strip Poker (set 5, 48k, EDOS)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1986</year>
+		<publisher>EDOS</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47154">
 				<rom name="samantha fox strip poker (edos).tzx" size="47154" crc="da8f98af" sha1="348810dbaa92cc7c00306603b9640e6885e70cb1"/>
@@ -26498,7 +26641,7 @@ license:CC0
 	<software name="tbizarre">
 		<description>Toy Bizarre (set 1)</description>
 		<year>1985</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48021">
 				<rom name="toy bizarre.tzx" size="48021" crc="8971f4b7" sha1="248a5e5a83679b28352e030e743bbaadc3a2e1d5"/>
@@ -26509,7 +26652,7 @@ license:CC0
 	<software name="tbizarrep" cloneof="tbizarre">
 		<description>Toy Bizarre (set 2, Proein)</description>
 		<year>1985</year>
-		<publisher>Activision Inc / Proein</publisher>
+		<publisher>Proein Soft Line</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47829">
 				<rom name="toy bizarre (proein).tzx" size="47829" crc="4315e0f5" sha1="d14f733a9b97d81d24d4689d64eb765cc69a903f"/>
@@ -26520,7 +26663,7 @@ license:CC0
 	<software name="tbizarrer" cloneof="tbizarre">
 		<description>Toy Bizarre (set 3, Ricochet)</description>
 		<year>1985</year>
-		<publisher>Activision Inc / Ricochet</publisher>
+		<publisher>Ricochet</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="39327">
 				<rom name="toy bizarre (ricochet).tzx" size="39327" crc="89c7e36f" sha1="90800324c4f87ea3ef1652d117b4bc73942bac31"/>
@@ -26531,7 +26674,7 @@ license:CC0
 	<software name="tbizarrea" cloneof="tbizarre">
 		<description>Toy Bizarre (set 4)</description>
 		<year>1985</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48248">
 				<rom name="toy bizarre_tzx120.tzx" size="48248" crc="4d4c7964" sha1="101bc29e48a15afedfb5596d75d3befbd04b1e55"/>
@@ -26791,7 +26934,7 @@ license:CC0
 	<software name="timescan">
 		<description>Time Scanner</description>
 		<year>1989</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="107498">
 				<rom name="time scanner.tzx" size="107498" crc="14917a25" sha1="70c6d292ea461b9cef21c22d59d3b0efceadbdac"/>
@@ -27729,7 +27872,7 @@ license:CC0
 	<software name="vgame">
 		<description>V (set 1)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49805">
 				<rom name="v.tzx" size="49805" crc="31222368" sha1="558a096954e46095b2417a16ea55b7f73f62ce1a"/>
@@ -27740,7 +27883,7 @@ license:CC0
 	<software name="vgameer" cloneof="vgame">
 		<description>V (set 2, Erbe)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50424">
 				<rom name="v (erbe).tzx" size="50424" crc="3fa59050" sha1="93d20a9b9606caeca7d6d1e0698088077664daa6"/>
@@ -27751,7 +27894,7 @@ license:CC0
 	<software name="vgamea" cloneof="vgame">
 		<description>V (set 3)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50232">
 				<rom name="v_tzx120.tzx" size="50232" crc="e48831bd" sha1="d61d33f5a9033a8890a008afdf35c3de0c0b0fc4"/>
@@ -28005,7 +28148,7 @@ license:CC0
 	<software name="montymol">
 		<description>Wanted - Monty Mole (set 1)</description>
 		<year>1984</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49616">
 				<rom name="wanted - monty mole.tzx" size="49616" crc="d44d933c" sha1="3630807bc6d466a1196954df059141a9ca2ea177"/>
@@ -28016,7 +28159,7 @@ license:CC0
 	<software name="montymola" cloneof="montymol">
 		<description>Wanted - Monty Mole (set 2)</description>
 		<year>1984</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="49624">
 				<rom name="wanted - monty mole - alternate - side 1.tzx" size="49624" crc="daf460cf" sha1="29a0cdcdb573af093b1984d0fb51a819470e5366"/>
@@ -28184,7 +28327,7 @@ license:CC0
 	<software name="wtss">
 		<description>Where Time Stood Still</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="125128">
 				<rom name="where time stood still.tzx" size="125128" crc="71c9911c" sha1="009dc04f255564c1bda2905554388bb8e6b45c85"/>
@@ -28240,7 +28383,7 @@ license:CC0
 	<software name="wtsse" cloneof="wtss">
 		<description>Where Time Stood Still (Erbe)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="121314">
 				<rom name="where time stood still (erbe).tzx" size="121314" crc="b4abc5a0" sha1="1bf8178c53013812613a63dffd90ae12a4679326"/>
@@ -28608,7 +28751,7 @@ license:CC0
 	<software name="xcel">
 		<description>Xcel</description>
 		<year>1985</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="52709">
 				<rom name="xcel.tzx" size="52709" crc="289645f6" sha1="6bb9b2818bb3884f3a3beee73792aa34c6602d32"/>
@@ -28968,7 +29111,7 @@ license:CC0
 	<software name="zenji">
 		<description>Zenji</description>
 		<year>1984</year>
-		<publisher>Activision Inc</publisher>
+		<publisher>Activision</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="23290">
 				<rom name="zenji.tzx" size="23290" crc="1b605673" sha1="60a6351f15f56d6632cd9efdeef95b49f3a5d473"/>
@@ -29721,7 +29864,7 @@ license:CC0
 	<software name="incrowd">
 		<description>The In Crowd (compilation)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="112214">
 				<rom name="the in crowd - tape 1 - side 1.tzx" size="112214" crc="496d769f" sha1="5382cae206d70b584c73d523acb743f1f5397016"/>
@@ -29787,7 +29930,7 @@ license:CC0
 	<software name="megamix">
 		<description>Mega Mix (set 1)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="116020">
 				<rom name="mega mix - alternate - tape 1 - side 1.tzx" size="116020" crc="7e773fac" sha1="7ab97a66213b36b68321cbef5ec601f2338589da"/>
@@ -29833,7 +29976,7 @@ license:CC0
 	<software name="megamixa" cloneof="megamix">
 		<description>Mega Mix (set 2)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="115879">
 				<rom name="mega mix - tape 1 - side a.tzx" size="115879" crc="dbe76a5a" sha1="5d4e59390c0ed1d8873eb3f2a71e200f5431f52d"/>
@@ -30203,7 +30346,7 @@ license:CC0
 	<software name="fstfury">
 		<description>Fists Of Fury (compilation)</description>
 		<year>1991</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="134262">
 				<rom name="fists of fury - tape 1 - side a.tzx" size="134262" crc="14d322ca" sha1="d88166bfea252b459f4d04ea32070b056e487f8c"/>
@@ -30240,7 +30383,7 @@ license:CC0
 	<software name="now4">
 		<description>Now Games 4 (Dan Dare - Pilot of the Future, Back to the Future, Hacker, Mission Omega, Jonah Barrington's Squash)</description>
 		<year>1987</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="105574">
 				<rom name="now games 4 - side a.tzx" size="105574" crc="c5ae6a5a" sha1="fd407572bdd8da91a8855ab2b7eb00094a70d7ab"/>
@@ -37164,6 +37307,17 @@ license:CC0
 	</software>
 
 	<software name="3dstockc">
+		<description>3D Stock Car Championship</description>
+		<year>1988</year>
+		<publisher>Firebird Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="57813">
+				<rom name="3d stock car championship.tzx" size="57813" crc="beaea44b" sha1="4823629b6ec8a583387e248548bd4cb9bf84d9e1"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="3dstockc_a" cloneof="3dstockc">
 		<description>3D Stock Car Championship (MCM)</description>
 		<year>1988</year>
 		<publisher>MCM Software</publisher>
@@ -37174,21 +37328,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="3dstockc_a" cloneof="3dstockc">
-		<description>3D Stock Car Championship</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="57813">
-				<rom name="3d stock car championship.tzx" size="57813" crc="beaea44b" sha1="4823629b6ec8a583387e248548bd4cb9bf84d9e1"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="3dstockc_b" cloneof="3dstockc">
+	<software name="3dstockc2">
 		<description>3D Stock Cars 2</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1992</year>
+		<publisher>Challenge Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="41529">
 				<rom name="3d stock cars 2.tzx" size="41529" crc="7bd15776" sha1="25a1622fc03a3fba471e6bd9f0973a7d98d41a6d"/>
@@ -40479,7 +40622,7 @@ license:CC0
 	</software>
 
 	<software name="amazonia">
-		<description>Amazonia - Bugfix</description>
+		<description>Amazônia (bugfix release)</description>
 		<year>1985</year>
 		<publisher>Ciberne</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -40490,9 +40633,9 @@ license:CC0
 	</software>
 
 	<software name="amazonia_a" cloneof="amazonia">
-		<description>Amazonia</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Amazônia</description>
+		<year>1985</year>
+		<publisher>Ciberne</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="27422">
 				<rom name="amazonia.tzx" size="27422" crc="f4773a6e" sha1="ec3bce0aad8880da2a1a792b117ebf87949137ce"/>
@@ -41295,18 +41438,7 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="apbthehi">
-		<description>APB (The Hit Squad)</description>
-		<year>1991</year>
-		<publisher>The Hit Squad</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="81957">
-				<rom name="apb (the hit squad).tzx" size="81957" crc="d1cdbeb4" sha1="c33ebefc8fc46558f42457ce496d02e4b6352ca5"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="apbside1">
+	<software name="apb">
 		<description>APB</description>
 		<year>1989</year>
 		<publisher>Domark</publisher>
@@ -41322,6 +41454,33 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="apba" cloneof="apb">
+		<description>APB (Erbe)</description>
+		<year>1989</year>
+		<publisher>Erbe Software</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="44618">
+				<rom name="APB - Side 1 (Erbe).tzx" size="37335" crc="6c1af8b0" sha1="c6daf30cb056da51896cb50b297ece904e6bdd23"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="37335">
+				<rom name="APB - Side 2 (Erbe).tzx" size="44618" crc="9d04ad5f" sha1="7bb149f4805488072fccad7794e32fa6b0ecab75"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="apbb" cloneof="apb">
+		<description>APB (The Hit Squad)</description>
+		<year>1991</year>
+		<publisher>The Hit Squad</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="81957">
+				<rom name="apb (the hit squad).tzx" size="81957" crc="d1cdbeb4" sha1="c33ebefc8fc46558f42457ce496d02e4b6352ca5"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="apfelkob">
 		<description>Apfelkobold</description>
 		<year>1983</year>
@@ -41847,7 +42006,7 @@ license:CC0
 	<software name="armagedo">
 		<description>Armageddon (1983 Ocean) (set 1)</description>
 		<year>1983</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="13827">
 				<rom name="armageddon.tzx" size="13827" crc="3f86015f" sha1="1123e8f7e7ad2edcafd93e4172186494f4620efc"/>
@@ -42156,12 +42315,34 @@ license:CC0
 	</software>
 
 	<software name="aspargpm">
-		<description>Aspar - GP Master</description>
+		<description>Aspar - GP Master (set 1)</description>
 		<year>1988</year>
 		<publisher>Dinamic Software</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="44176">
-				<rom name="aspar - gp master.tzx" size="44176" crc="c77e0fea" sha1="53883891627cbe94881caa527584aafcff3f7701"/>
+			<dataarea name="cass" size="43878">
+				<rom name="Aspar - GP Master.tzx" size="43878" crc="f44037eb" sha1="cea29e4d46e4481b45409c5779312e7c97841c70"/>
+			</dataarea>
+		</part>
+	</software>
+	
+	<software name="aspargpma" cloneof="aspargpm">
+		<description>Aspar - GP Master (set 2)</description>
+		<year>1989</year>
+		<publisher>Dinamic Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="57623">
+				<rom name="grand prix master.tzx" size="57623" crc="e0d2f1ce" sha1="a6612b840129c4c22adbbc99552d3edf58f27941"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="aspargpmb" cloneof="aspargpm">
+		<description>Aspar - GP Master (IBSA)</description>
+		<year>1988</year>
+		<publisher>IBSA</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="43913">
+				<rom name="Aspar - GP Master (IBSA).tzx" size="43913" crc="bbd5f464" sha1="76576f878fd6a35b32843e2229fa92264655edb9"/>
 			</dataarea>
 		</part>
 	</software>
@@ -43408,7 +43589,7 @@ license:CC0
 	</software>
 
 	<software name="theateam">
-		<description>The A Team</description>
+		<description>The A-Team</description>
 		<year>1988</year>
 		<publisher>Zafiro Software Division</publisher>
 		<part name="cass1" interface="spectrum_cass">
@@ -43423,6 +43604,22 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="elequipo" cloneof="theateam">
+		<description>El Equipo A</description>
+		<year>1988</year>
+		<publisher>Zafiro Software Division</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="48336">
+				<rom name="el equipo a - side 1.tzx" size="48336" crc="2c570821" sha1="8e95e5b1df68e428229ead1a1254d29c0fdb7dd2"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="49267">
+				<rom name="el equipo a - side 2.tzx" size="49267" crc="435e4d6e" sha1="54bd816675a07b93886a23700d63409ac84115ae"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="theaddam">
 		<description>The Addams Family (The Hit Squad)</description>
 		<year>1991</year>
@@ -45548,6 +45745,17 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="beverlyha" cloneof="beverlyh">
+		<description>Beverly Hills Cop (IBSA)</description>
+		<year>1990</year>
+		<publisher>IBSA</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="112148">
+				<rom name="Beverly Hills Cop (IBSA).tzx" size="112148" crc="b0b794bd" sha1="dc5411c1972aabcded6e487930c374a959b14081"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="bewareco">
 		<description>Beware Collaborators</description>
 		<year>19??</year>
@@ -48094,10 +48302,21 @@ license:CC0
 	<software name="brumbrum">
 		<description>Brum Brum</description>
 		<year>1984</year>
-		<publisher>Astor</publisher>
+		<publisher>Astor Software</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="15356">
-				<rom name="brum brum.tzx" size="15356" crc="aef0bf0c" sha1="dbce4ad97fac8ba9a12d0637ecee084d2acb494c"/>
+			<dataarea name="cass" size="26101">
+				<rom name="brum brum.tzx" size="26101" crc="1e940a29" sha1="1b2ed966b8f3803481bbe3d020614758a9c93fe5"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="brumbruma" cloneof="brumbrum">
+		<description>Brum Brum (Master)</description>
+		<year>1984</year>
+		<publisher>Astor Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="15510">
+				<rom name="brum brum (master).tzx" size="15510" crc="40278c89" sha1="72d35576f5beac6ff31239c679563bfe4646f3a2"/>
 			</dataarea>
 		</part>
 	</software>
@@ -49712,21 +49931,21 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="cannibal_a" cloneof="cannibal">
-		<description>Cannibals (System 4)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="canoutsp">
+		<description>Cannibals From Outer Space (set 1)</description>
+		<year>1987</year>
+		<publisher>Summit Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50041">
-				<rom name="cannibals (system 4).tzx" size="50041" crc="016e518c" sha1="b64cb8bb1b668ba7b2d4dbb05b0b4cac806caa04"/>
+				<rom name="cannibals.tzx" size="50041" crc="f747bdd6" sha1="7700695303e086070597ab7a5e9ac832922d1838"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="cannibal_b" cloneof="cannibal">
-		<description>Cannibals From Outer Space</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="canoutspa" cloneof="canoutsp">
+		<description>Cannibals From Outer Space (set 2)</description>
+		<year>1987</year>
+		<publisher>Summit Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="50041">
 				<rom name="cannibals from outer space.tzx" size="50041" crc="a7aaa2a6" sha1="6c4021675f73ad3ea8015086409375d63d92bd1e"/>
@@ -49734,13 +49953,13 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="cannibal_c" cloneof="cannibal">
-		<description>Cannibals</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="canoutspb" cloneof="canoutsp">
+		<description>Cannibals From Outer Space (System 4)</description>
+		<year>1988</year>
+		<publisher>System 4</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="50041">
-				<rom name="cannibals.tzx" size="50041" crc="f747bdd6" sha1="7700695303e086070597ab7a5e9ac832922d1838"/>
+			<dataarea name="cass" size="50165">
+				<rom name="Cannibals From Outer Space (System 4).tzx" size="50165" crc="6f9a4953" sha1="b7ea7d141e11fdb06f090caf950814d2dc51a53f"/>
 			</dataarea>
 		</part>
 	</software>
@@ -52049,6 +52268,28 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="scacchi" cloneof="chess">
+		<description>Scacchi</description>
+		<year>1983</year>
+		<publisher>Rebit Computer</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="18342">
+				<rom name="scacchi.tzx" size="18342" crc="d49f81d7" sha1="16acd5a6b16dcf20a9b131231e6475b425a016dc"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="xadrez" cloneof="chess">
+		<description>Xadrez</description>
+		<year>1983</year>
+		<publisher>Timex Portugal</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="27028">
+				<rom name="xadrez.tzx" size="27028" crc="cc7f6535" sha1="dd332fa59c862d2310a6d57d6cfcadb07b0e3561"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="chicago3">
 		<description>Chicago 30's (US Gold)</description>
 		<year>1988</year>
@@ -53243,7 +53484,7 @@ license:CC0
 	<software name="codemat2">
 		<description>Codename MAT II (set 1)</description>
 		<year>1984</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48048">
 				<rom name="codename mat 2.tzx" size="48048" crc="b350a533" sha1="d5259c948776e8a63d0e624a8496b706003824d0"/>
@@ -54302,20 +54543,20 @@ license:CC0
 	</software>
 
 	<software name="continen">
-		<description>Continental Circus (Mastertronic Plus)</description>
+		<description>Continental Circus</description>
 		<year>1989</year>
-		<publisher>Mastertronic Plus</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="128065">
-				<rom name="continental circus (mastertronic plus).tzx" size="128065" crc="553ac6b1" sha1="bc18152f67fbd2a12e4e8a41c16a52b11e0558c3"/>
+			<dataarea name="cass" size="127725">
+				<rom name="continental circus.tzx" size="127725" crc="36ea70fc" sha1="2f78be15d40a5adcb739b0ffadad833f47214fd9"/>
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="continen_a" cloneof="continen">
 		<description>Continental Circus (Tronix)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1989</year>
+		<publisher>Tronix</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="127755">
 				<rom name="continental circus (tronix).tzx" size="127755" crc="ccf69569" sha1="e9e088b62f59f32142d96c0b57e4d286b13fddc0"/>
@@ -54325,8 +54566,8 @@ license:CC0
 
 	<software name="continen_b" cloneof="continen">
 		<description>Continental Circus (Dro Soft)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1989</year>
+		<publisher>Dro Soft</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="81774">
 				<rom name="continental circus - side a (dro soft).tzx" size="81774" crc="7a8c9e57" sha1="3bd7a7f60fc5406117fade17a18c27953b996ed0"/>
@@ -54338,22 +54579,22 @@ license:CC0
 			</dataarea>
 		</part>
 	</software>
-
-	<software name="continen_d" cloneof="continen">
-		<description>Continental Circus</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	
+	<software name="continen_c" cloneof="continen">
+		<description>Continental Circus (Mastertronic Plus)</description>
+		<year>1989</year>
+		<publisher>Mastertronic Plus</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="127725">
-				<rom name="continental circus.tzx" size="127725" crc="36ea70fc" sha1="2f78be15d40a5adcb739b0ffadad833f47214fd9"/>
+			<dataarea name="cass" size="128065">
+				<rom name="continental circus (mastertronic plus).tzx" size="128065" crc="553ac6b1" sha1="bc18152f67fbd2a12e4e8a41c16a52b11e0558c3"/>
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="contract">
 		<description>Contract Bridge</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1984</year>
+		<publisher>Highlight Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48945">
 				<rom name="contract bridge.tzx" size="48945" crc="10c218ba" sha1="9a6c3c5ee88cb5c742f69cc153716f3a1ad17762"/>
@@ -61737,7 +61978,7 @@ license:CC0
 	<software name="dkong">
 		<description>Donkey Kong</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="52000">
 				<rom name="donkey kong.tzx" size="52000" crc="b1a1a4ba" sha1="1fa66a1011e459a18265f5a73d615aa2327c8f39"/>
@@ -61748,7 +61989,7 @@ license:CC0
 	<software name="dkonger" cloneof="dkong">
 		<description>Donkey Kong (Erbe)</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="51328">
 				<rom name="donkey kong (erbe).tzx" size="51328" crc="02b0faa5" sha1="c5530df62a0614d7a2a8e3652f0905d5d8484708"/>
@@ -61759,7 +62000,7 @@ license:CC0
 	<software name="dkongpl2" cloneof="dkong">
 		<description>Donkey Kong +2</description>
 		<year>1986</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="52000">
 				<rom name="donkey kong +2.tzx" size="52000" crc="d29613b3" sha1="d62c9d06d2f2a04f5586634fd56031f4ca7083f2"/>
@@ -64036,7 +64277,23 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="emotion1">
+	<software name="emotions">
+		<description>E-Motion</description>
+		<year>1990</year>
+		<publisher>U.S. Gold</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="43580">
+				<rom name="e-motion - side a.tzx" size="43580" crc="65597c97" sha1="cf318e782e7fdff110422d81b0c8c08fed7515e2"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="53034">
+				<rom name="e-motion - side b.tzx" size="53034" crc="d335d40b" sha1="9aeb17e055fa5b505917bc4e34022ab94a3782c6"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="emotions_a" cloneof="emotions">
 		<description>E-Motion (Erbe - Serie 5 Estrellas) (set 1)</description>
 		<year>1990</year>
 		<publisher>Erbe Software</publisher>
@@ -64052,7 +64309,7 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="emotions">
+	<software name="emotions_b" cloneof="emotions">
 		<description>E-Motion (Erbe - Serie 5 Estrellas) (set 2)</description>
 		<year>1990</year>
 		<publisher>Erbe Software</publisher>
@@ -64068,18 +64325,18 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="emotions_b" cloneof="emotions">
-		<description>E-Motion</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="emotions_c" cloneof="emotions">
+		<description>E-Motion (Musical 1)</description>
+		<year>1991</year>
+		<publisher>Musical 1</publisher>
 		<part name="cass1" interface="spectrum_cass">
-			<dataarea name="cass" size="43580">
-				<rom name="e-motion - side a.tzx" size="43580" crc="65597c97" sha1="cf318e782e7fdff110422d81b0c8c08fed7515e2"/>
+			<dataarea name="cass" size="46210">
+				<rom name="e-motion - side 1 (musical 1).tzx" size="46210" crc="ddb2ebda" sha1="4e663c816be5d7f456c6df5ef275b81620cf6cf1"/>
 			</dataarea>
 		</part>
 		<part name="cass2" interface="spectrum_cass">
-			<dataarea name="cass" size="53034">
-				<rom name="e-motion - side b.tzx" size="53034" crc="d335d40b" sha1="9aeb17e055fa5b505917bc4e34022ab94a3782c6"/>
+			<dataarea name="cass" size="54606">
+				<rom name="e-motion - side 2 (musical 1).tzx" size="54606" crc="10c0e62b" sha1="d4dea38b32a14e536b56371f16f14fc27821ec56"/>
 			</dataarea>
 		</part>
 	</software>
@@ -64607,22 +64864,6 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="elequipo">
-		<description>El Equipo A</description>
-		<year>1988</year>
-		<publisher>Zafiro Software Division</publisher>
-		<part name="cass1" interface="spectrum_cass">
-			<dataarea name="cass" size="48336">
-				<rom name="el equipo a - side 1.tzx" size="48336" crc="2c570821" sha1="8e95e5b1df68e428229ead1a1254d29c0fdb7dd2"/>
-			</dataarea>
-		</part>
-		<part name="cass2" interface="spectrum_cass">
-			<dataarea name="cass" size="49267">
-				<rom name="el equipo a - side 2.tzx" size="49267" crc="435e4d6e" sha1="54bd816675a07b93886a23700d63409ac84115ae"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="elexplor">
 		<description>El Explorador</description>
 		<year>1984</year>
@@ -64645,8 +64886,6 @@ license:CC0
 		</part>
 	</software>
 
-
-
 	<software name="elmundop">
 		<description>El Mundo Perdido (Set 1)</description>
 		<year>1988</year>
@@ -69736,7 +69975,7 @@ license:CC0
 	<software name="fboty">
 		<description>Footballer Of The Year (set 1)</description>
 		<year>1986</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="49273">
 				<rom name="footballer of the year.tzx" size="49273" crc="e0a2bd72" sha1="1e38ba8dbe151e7dd45de62a578c76ef57f34f91"/>
@@ -69758,7 +69997,7 @@ license:CC0
 	<software name="fboty2">
 		<description>Footballer Of The Year 2 (set 1)</description>
 		<year>1989</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48039">
 				<rom name="footballer of the year 2.tzx" size="48039" crc="b9657a35" sha1="6dbada3f79e97859f29fe24ef55d75a56b6a3e47"/>
@@ -70024,7 +70263,6 @@ license:CC0
 		</part>
 	</software>
 
-
 	<software name="form1ss">
 		<description>Formula One (1984, Spirit Software)</description>
 		<year>1984</year>
@@ -70037,9 +70275,9 @@ license:CC0
 	</software>
 
 	<software name="f1simul" cloneof="form1ss">
-		<description>Formula 1 Simulator (set 1, Mastertronic)</description>
+		<description>Formula 1 Simulator (Mastertronic)</description>
 		<year>1986</year>
-		<publisher>Spirit Software / Mastertronic Ltd</publisher>
+		<publisher>Mastertronic</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="41156">
 				<rom name="formula 1 simulator.tzx" size="41156" crc="92cbbae5" sha1="de486c1fc86cdc30abf9c145edaa98b593ca6cf2"/>
@@ -70048,9 +70286,9 @@ license:CC0
 	</software>
 
 	<software name="f1simula" cloneof="form1ss">
-		<description>Formula 1 Simulator (set 2, Dro Soft)</description>
+		<description>Formula 1 Simulator (Dro Soft)</description>
 		<year>1987</year>
-		<publisher>Spirit Software / Mastertronic Ltd / Dro Soft</publisher>
+		<publisher>Dro Soft</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="41233">
 				<rom name="formula 1 simulator (dro soft).tzx" size="41233" crc="e44fc871" sha1="288d2a6171874a2cd4599c3be925b890a1550d9d"/>
@@ -70375,20 +70613,20 @@ license:CC0
 	</software>
 
 	<software name="fred">
-		<description>Fred (set 1)</description>
+		<description>Fred</description>
 		<year>1984</year>
-		<publisher>Investronica S.A.</publisher>
+		<publisher>Investronica</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="30877">
-				<rom name="fred.tzx" size="30877" crc="4c8dc7f1" sha1="a7f749e4f1a38bbe9e56d13afc030c2c7fb92b93"/>
+			<dataarea name="cass" size="30974">
+				<rom name="fred.tzx" size="30974" crc="5a624921" sha1="3b8d0db471a16c287a7b09e93137d5deefa3778f"/>
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="freda" cloneof="fred">
-		<description>Fred (set 2, Quicksilva)</description>
+		<description>Fred (Quicksilva)</description>
 		<year>1984</year>
-		<publisher>Investronica S.A. / Quicksilva</publisher>
+		<publisher>Quicksilva</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="31294">
 				<rom name="fred (quicksilva).tzx" size="31294" crc="29330416" sha1="c5b411a9e26b84ab0a61065fb198d3f6d2ed8867"/>
@@ -70396,6 +70634,17 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="fredb" cloneof="fred">
+		<description>Fred (Microbyte)</description>
+		<year>1987</year>
+		<publisher>Microbyte</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="30913">
+				<rom name="Fred (Microbyte).tzx" size="30913" crc="f2a0712f" sha1="3542c036e4a60db705f43be203f54ebd799a6c5d"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="freddy">
 		<description>Freddy Hardest (set 1)</description>
 		<year>1987</year>
@@ -71778,7 +72027,7 @@ license:CC0
 	<software name="finmtrix">
 		<description>The Final Matrix</description>
 		<year>1987</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="58479">
 				<rom name="the final matrix.tzx" size="58479" crc="02a5cd88" sha1="39e25ad00830696bc9be41683303da381075bcf2"/>
@@ -72709,7 +72958,7 @@ license:CC0
 	<software name="garylhot">
 		<description>Gary Lineker's Hot Shot! (set 1)</description>
 		<year>1988</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48098">
 				<rom name="gary lineker_s hot shot.tzx" size="48098" crc="35305d89" sha1="796ff6f73d8f1e038b71517529c7ecd712cfb309"/>
@@ -72731,7 +72980,7 @@ license:CC0
 	<software name="garylstr">
 		<description>Gary Lineker's Super Star Soccer</description>
 		<year>1987</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47956">
 				<rom name="gary lineker_s super star soccer.tzx" size="47956" crc="c32aaf6a" sha1="036d00a0ec8acf87fab443494353288182a7d7e8"/>
@@ -72753,7 +73002,7 @@ license:CC0
 	<software name="garylskl">
 		<description>Gary Lineker's Superskills</description>
 		<year>1988</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="110534">
 				<rom name="gary lineker_s superskills.tzx" size="110534" crc="7c888643" sha1="265ac631ebf4b5783de4c6a70fa2038b7d6a5373"/>
@@ -73505,7 +73754,7 @@ license:CC0
 	<software name="gladiatr">
 		<description>Gladiator (set 1)</description>
 		<year>1986</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="45307">
 				<rom name="gladiator - 48k.tzx" size="45307" crc="970ccb56" sha1="6e3c4f5b84d0dead85222bb039e5220db814f806"/>
@@ -74617,10 +74866,32 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="grandpri_a" cloneof="grandpri">
+	<software name="gpcirc">
+		<description>Grand Prix Circuit</description>
+		<year>1990</year>
+		<publisher>Accolade</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="101394">
+				<rom name="grand prix circuit.tzx" size="101394" crc="106296ba" sha1="f8771245b9170b15e0427fd015733ec5a3dd791b"/>
+			</dataarea>
+		</part>
+	</software>
+	
+	<software name="gpcirca" cloneof="gpcirc">
+		<description>Grand Prix Circuit (Dro Soft)</description>
+		<year>1990</year>
+		<publisher>Dro Soft</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="101426">
+				<rom name="Grand Prix Circuit (Dro Soft).tzx" size="101426" crc="dcffae99" sha1="fcc1a79126b5335d036400004448c425690e0abc"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="gprixchal">
 		<description>Grand Prix Challenge</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1992</year>
+		<publisher>Challenge Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="39722">
 				<rom name="grand prix challenge.tzx" size="39722" crc="54f54eaf" sha1="5d9b7c26bbc77fc6583ba2bca5195fb90edb0624"/>
@@ -74628,21 +74899,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="grandpri_b" cloneof="grandpri">
-		<description>Grand Prix Circuit</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="101394">
-				<rom name="grand prix circuit.tzx" size="101394" crc="106296ba" sha1="f8771245b9170b15e0427fd015733ec5a3dd791b"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="grandpri_c" cloneof="grandpri">
+	<software name="gprixdriv">
 		<description>Grand Prix Driver</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1983</year>
+		<publisher>Britannia Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="40955">
 				<rom name="grand prix driver.tzx" size="40955" crc="0a3c184a" sha1="8268a9628a067cd54996cb8c08608f3641fe021e"/>
@@ -74650,10 +74910,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="grandpri_d" cloneof="grandpri">
+	<software name="gpmanager">
 		<description>Grand Prix Manager</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1984</year>
+		<publisher>Silicon Joy</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="41441">
 				<rom name="grand prix manager.tzx" size="41441" crc="c77f5da0" sha1="795a6a5e06d32555c23949dd4e86662343abbca8"/>
@@ -74661,21 +74921,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="grandpri_e" cloneof="grandpri">
-		<description>Grand Prix Master</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="57623">
-				<rom name="grand prix master.tzx" size="57623" crc="e0d2f1ce" sha1="a6612b840129c4c22adbbc99552d3edf58f27941"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="grandpri_f" cloneof="grandpri">
+	<software name="gptennis">
 		<description>Grand Prix Tennis</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1988</year>
+		<publisher>Mastertronic Added Dimension</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="28636">
 				<rom name="grand prix tennis.tzx" size="28636" crc="c5ce473e" sha1="5eba4cbfe4b77633a38dbf8b4a2641272247fe34"/>
@@ -74683,10 +74932,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="grandpri_g" cloneof="grandpri">
+	<software name="grandprix">
 		<description>Grand Prix</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1989</year>
+		<publisher>D&amp;H Games</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47675">
 				<rom name="grand prix.tzx" size="47675" crc="7cd2fd0b" sha1="472889cde4d17ac39e64d85c19e6aeaa416bdb3b"/>
@@ -75384,7 +75633,7 @@ license:CC0
 	<software name="gryzor">
 		<description>Gryzor (set 1)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="124232">
 				<rom name="gryzor - side 1.tzx" size="124232" crc="7dfb0343" sha1="0829f4c99cca1f4ad73d3f1447fe77acc8a08be7"/>
@@ -75400,7 +75649,7 @@ license:CC0
 	<software name="gryzora" cloneof="gryzor">
 		<description>Gryzor (set 2, Erbe)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="115286">
 				<rom name="gryzor (erbe) - 128k.tzx" size="115286" crc="2a015772" sha1="e57732c3aaaa468c60265e207e2150e8877f9627"/>
@@ -75416,7 +75665,7 @@ license:CC0
 	<software name="gryzorhs" cloneof="gryzor">
 		<description>Gryzor (set 3, The Hit Squad)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="120983">
 				<rom name="gryzor - 128k (the hit squad).tzx" size="120983" crc="bfd2e458" sha1="6cd89c0260168bf34dda31e0b2913b0c91d76156"/>
@@ -77072,7 +77321,7 @@ license:CC0
 	<software name="harddriv">
 		<description>Hard Drivin' (set 1)</description>
 		<year>1989</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="47435">
 				<rom name="hard drivin_ - 128k.tzx" size="47435" crc="3b14a8fd" sha1="bfa89eb1096222fdfe596100a167779bc7490fec"/>
@@ -77088,7 +77337,7 @@ license:CC0
 	<software name="harddrivhs" cloneof="harddriv">
 		<description>Hard Drivin' (The Hit Squad)</description>
 		<year>1989</year>
-		<publisher>Domark Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="47287">
 				<rom name="hard drivin_ - 128k (the hit squad).tzx" size="47287" crc="0bd44791" sha1="a96729dfe0fd3803f5fed038d960ebe3ebf9016b"/>
@@ -77183,7 +77432,7 @@ license:CC0
 	<software name="hate">
 		<description>H.A.T.E. - Hostile All Terrain Encounter</description>
 		<year>1989</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="44500">
 				<rom name="hate.tzx" size="44500" crc="3bc4940e" sha1="f87ad5723cf6192e140be2b430d8d491bf544ef0"/>
@@ -77224,6 +77473,17 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="hhouse">
+		<description>Haunted House</description>
+		<year>1983</year>
+		<publisher>C&amp;VG</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="6755">
+				<rom name="Haunted House.tzx" size="6755" crc="2e639d4a" sha1="95d2e778633b273de02f1f865954a239b87fed22"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- written in BASIC, needs RUN after loading -->
 	<software name="hhousead">
 		<description>Haunted House Adventure</description>
@@ -77838,7 +78098,7 @@ license:CC0
 	<software name="hercslay">
 		<description>Hercules Slayer Of The Damned (set 1)</description>
 		<year>1988</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="108910">
 				<rom name="hercules slayer of the damned.tzx" size="108910" crc="367230df" sha1="8f6870627c8bf7dc4833fbe2e7287a2299ef157f"/>
@@ -77912,7 +78172,29 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="heroques">
+	<software name="heroqst">
+		<description>Hero Quest (128k)</description>
+		<year>1991</year>
+		<publisher>Gremlin Graphics Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="112032">
+				<rom name="hero quest - 128k.tzx" size="112032" crc="33c59a10" sha1="31c2432a223ce3458329ef1c50864297dea5fb23"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="heroqsta" cloneof="heroqst">
+		<description>Hero Quest (48k)</description>
+		<year>1991</year>
+		<publisher>Gremlin Graphics Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="137704">
+				<rom name="hero quest - 48k.tzx" size="137704" crc="c3077599" sha1="a319342ba9cd1e89ceb59dc21a2b8270e2d93d7b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="heroqstb" cloneof="heroqst">
 		<description>Hero Quest (GBH)</description>
 		<year>1991</year>
 		<publisher>GBH Gold</publisher>
@@ -77923,24 +78205,66 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="heroques_a" cloneof="heroques">
-		<description>Hero Quest - 128k</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="heroqstc" cloneof="heroqst">
+		<description>Hero Quest (Dro Soft)</description>
+		<year>1991</year>
+		<publisher>Dro Soft</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="112032">
-				<rom name="hero quest - 128k.tzx" size="112032" crc="33c59a10" sha1="31c2432a223ce3458329ef1c50864297dea5fb23"/>
+			<dataarea name="cass" size="111913">
+				<rom name="Hero Quest (Dro Soft).tzx" size="111913" crc="071116c8" sha1="f2e8934d1dacde7f18c268b998b25735d6544756"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="heroques_b" cloneof="heroques">
-		<description>Hero Quest - 48k</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="rwitchl">
+		<description>Hero Quest: Return of the Witch Lord</description>
+		<year>1991</year>
+		<publisher>Gremlin Graphics Software</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="105971">
+				<rom name="return of the witch lord - side 1.tzx" size="105971" crc="ce90c8ab" sha1="81df97e582eb921a321a6c15b5d9ecefcbdc6460"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="105754">
+				<rom name="return of the witch lord - side 2.tzx" size="105754" crc="7d994180" sha1="932068f1b26339d699537c12c714253ce83c9097"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rwitchld" cloneof="rwitchl">
+		<description>Hero Quest: Return of the Witch Lord (Dro Soft re-release)</description>
+		<year>1991</year>
+		<publisher>Dro Soft</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="137704">
-				<rom name="hero quest - 48k.tzx" size="137704" crc="c3077599" sha1="a319342ba9cd1e89ceb59dc21a2b8270e2d93d7b"/>
+			<dataarea name="cass" size="106012">
+				<rom name="return of the witch lord (dro soft).tzx" size="106012" crc="56f2cf41" sha1="1ea72d0fa33c3aa8a4a110cf171286c3eb5db76a"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="hqtwin">
+		<description>Hero Quest Twin Pack</description>
+		<year>1991</year>
+		<publisher>Gremlin Graphics Software</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="111943">
+				<rom name="hero quest twin pack - tape 1 - side 1.tzx" size="111943" crc="89e050d1" sha1="e526e77b5a4f9b930616cbcc46f5694faeb8d8a1"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="137616">
+				<rom name="hero quest twin pack - tape 1 - side 2.tzx" size="137616" crc="b14cb6f5" sha1="754feba0a213d858b8782066f0bb1edd0eff476f"/>
+			</dataarea>
+		</part>
+		<part name="cass3" interface="spectrum_cass">
+			<dataarea name="cass" size="105871">
+				<rom name="hero quest twin pack - tape 2 - side 1.tzx" size="105871" crc="9769c43b" sha1="b3a53e2835c142f250c83dde524419ecd1ff6cf4"/>
+			</dataarea>
+		</part>
+		<part name="cass4" interface="spectrum_cass">
+			<dataarea name="cass" size="105655">
+				<rom name="hero quest twin pack - tape 2 - side 2.tzx" size="105655" crc="fd2dfa0d" sha1="ce6dc2da99456453d54c3e712553b99120ae8a35"/>
 			</dataarea>
 		</part>
 	</software>
@@ -79399,7 +79723,7 @@ license:CC0
 	<software name="htbcbast">
 		<description>How To Be A Complete Bastard (set 1)</description>
 		<year>1987</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="57364">
 				<rom name="how to be a complete bastard.tzx" size="57364" crc="4f06caa3" sha1="21c582928d74e32175bdccb1ae227c611fdadf05"/>
@@ -82536,7 +82860,7 @@ license:CC0
 	<software name="italia90">
 		<description>Italia '90 - World Cup Soccer (set 1)</description>
 		<year>1989</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="54833">
 				<rom name="italia _90 - world cup soccer.tzx" size="54833" crc="a4224a58" sha1="3b86c7ae94ae5a5f02c5fd9ed87d69b39681a1c6"/>
@@ -82569,7 +82893,7 @@ license:CC0
 	<software name="italia90c" cloneof="italia90">
 		<description>Italia '90 - World Cup Soccer (set 4, Tronix)</description>
 		<year>1989</year>
-		<publisher>Virgin Games Ltd / Tronix</publisher>
+		<publisher>Tronix</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="54833">
 				<rom name="italia _90 - world cup soccer (tronix).tzx" size="54833" crc="86b57861" sha1="45524ded135b034bd99067e16402ed3969297dbb"/>
@@ -82855,7 +83179,7 @@ license:CC0
 	<software name="islndvir">
 		<description>The Island (1983, Virgin)</description>
 		<year>1983</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="48987">
 				<rom name="the island (virgin).tzx" size="48987" crc="88320a83" sha1="b582762166dbb5fccd08e6fa7d88abb2b544db45"/>
@@ -85422,6 +85746,17 @@ license:CC0
 			</dataarea>
 		</part>
 	</software>
+	
+	<software name="perigosn" cloneof="jungletr">
+		<description>Perigos na Selva</description>
+		<year>1983</year>
+		<publisher>TMX Portugal</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="23070">
+				<rom name="perigos na selva.tzx" size="23070" crc="61c78a5f" sha1="c5b5c0a590164db3f7f4f6d35c8d5327a804580e"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="juniorar">
 		<description>Junior Arithmetic (Accord Data)</description>
@@ -85833,9 +86168,9 @@ license:CC0
 	</software>
 
 	<software name="karyssia_a" cloneof="karyssia">
-		<description>Karyssia - Queen Of Diamonds</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Karyssia - Queen Of Diamonds (set 1)</description>
+		<year>1987</year>
+		<publisher>Incentive</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="134318">
 				<rom name="karyssia - queen of diamonds.tzx" size="134318" crc="81a2dd24" sha1="50206f8557c97167bdb9e82cf9ee38473ddb55ff"/>
@@ -86080,7 +86415,7 @@ license:CC0
 	</software>
 
 	<software name="kickoff">
-		<description>Kick Off (set 1)</description>
+		<description>Kick Off</description>
 		<year>1989</year>
 		<publisher>Anco</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -86090,8 +86425,19 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="kickoffa" cloneof="kickoff">
+		<description>Kick Off (IBSA)</description>
+		<year>1989</year>
+		<publisher>IBSA</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="47114">
+				<rom name="Kick Off (IBSA).tzx" size="47114" crc="69de47e9" sha1="6f2a65aeec993e6bcf18037da30d305d4bdec29b"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="kickoffs" cloneof="kickoff">
-		<description>Kick Off (set 2, System 4)</description>
+		<description>Kick Off (System 4)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -86102,9 +86448,9 @@ license:CC0
 	</software>
 
 	<software name="kickofft" cloneof="kickoff">
-		<description>Kick Off (set 3, Top Shots)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Kick Off (Top Shots)</description>
+		<year>1989</year>
+		<publisher>Top Shots</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47099">
 				<rom name="kick off (top shots).tzx" size="47099" crc="37a0e70d" sha1="48f71b4a521c9195ecb9abc715ccc055265cf37b"/>
@@ -94109,6 +94455,17 @@ license:CC0
 	</software>
 
 	<software name="matchdy2">
+		<description>Match Day II</description>
+		<year>1987</year>
+		<publisher>Ocean</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="51188">
+				<rom name="match day ii.tzx" size="51188" crc="7f5e61e0" sha1="8646d00b48144236a92ebd6c7319252bbcbb75e5"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="matchdy2a" cloneof="matchdy2">
 		<description>Match Day 2 (Erbe)</description>
 		<year>1987</year>
 		<publisher>Erbe Software</publisher>
@@ -94119,10 +94476,21 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="matchdy2hs" cloneof="matchdy2">
+	<software name="matchdy2b" cloneof="matchdy2">
+		<description>Match Day 2 (Erbe, alternate)</description>
+		<year>1987</year>
+		<publisher>Erbe Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="41956">
+				<rom name="match day 2 - alternate (erbe).tzx" size="41956" crc="93c5132e" sha1="df42de953f6cfbce601eb241a262ec50316b117b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="matchdyc" cloneof="matchdy2">
 		<description>Match Day 2 (The Hit Squad)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1990</year>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="46578">
 				<rom name="match day 2 (the hit squad).tzx" size="46578" crc="2534e375" sha1="8788fe185c8dc33102cff603cc07c4a713e29020"/>
@@ -94130,24 +94498,13 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="matchdy2er" cloneof="matchdy2">
-		<description>Match Day 2 (set 2) (Erbe)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="matchdyd" cloneof="matchdy2">
+		<description>Match Day 2 (IBSA)</description>
+		<year>1987</year>
+		<publisher>IBSA</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="41874">
-				<rom name="match day 2 - alternate (erbe).tzx" size="41874" crc="7d97ca66" sha1="769eb2a855e9693b5fd1a8375ac22a20aaa59fe1"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="matchdy2a" cloneof="matchdy2">
-		<description>Match Day II</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="51188">
-				<rom name="match day ii.tzx" size="51188" crc="7f5e61e0" sha1="8646d00b48144236a92ebd6c7319252bbcbb75e5"/>
+			<dataarea name="cass" size="41951">
+				<rom name="Match Day 2 (IBSA - The Hit Squad).tzx" size="41951" crc="9c1e7d9a" sha1="6c9a54343be6e59d9806f1905489028f8735e7b1"/>
 			</dataarea>
 		</part>
 	</software>
@@ -97575,12 +97932,12 @@ license:CC0
 	</software>
 
 	<software name="moonwalk">
-		<description>Moonwalker (Kixx)</description>
+		<description>Moonwalker</description>
 		<year>1989</year>
-		<publisher>Kixx</publisher>
+		<publisher>U.S. Gold</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="172122">
-				<rom name="moonwalker (kixx).tzx" size="172122" crc="be146157" sha1="84a48c866ba7302e3ea35b70c92d25ae5d42c912"/>
+			<dataarea name="cass" size="172288">
+				<rom name="moonwalker.tzx" size="172288" crc="983698ef" sha1="71e093a346fef29383bde16faaf1d0c3ad99fc97"/>
 			</dataarea>
 		</part>
 	</software>
@@ -97597,12 +97954,23 @@ license:CC0
 	</software>
 
 	<software name="moonwalk_b" cloneof="moonwalk">
-		<description>Moonwalker</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Moonwalker (Kixx)</description>
+		<year>1989</year>
+		<publisher>Kixx</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="172288">
-				<rom name="moonwalker.tzx" size="172288" crc="983698ef" sha1="71e093a346fef29383bde16faaf1d0c3ad99fc97"/>
+			<dataarea name="cass" size="172122">
+				<rom name="moonwalker (kixx).tzx" size="172122" crc="be146157" sha1="84a48c866ba7302e3ea35b70c92d25ae5d42c912"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="moonwalk_c" cloneof="moonwalk">
+		<description>Moonwalker (Erbe)</description>
+		<year>1989</year>
+		<publisher>Erbe Software</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="171324">
+				<rom name="Moonwalker (Erbe).tzx" size="171324" crc="963667e2" sha1="b6f75d0508843e5288f61113074c9087158c22f0"/>
 			</dataarea>
 		</part>
 	</software>
@@ -97684,9 +98052,20 @@ license:CC0
 	</software>
 
 	<software name="morrisme">
+		<description>Morris Meets The Bikers</description>
+		<year>1983</year>
+		<publisher>Automata UK</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="23568">
+				<rom name="morris meets the bikers.tzx" size="23568" crc="587f7942" sha1="83f334ae491dc4388b44faac41e3a0f8012a5895"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="morrisme_a" cloneof="morrisme">
 		<description>Morris Meets The Bikers (ZX Data)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1983</year>
+		<publisher>ZX Data</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="7833">
 				<rom name="morris meets the bikers (zx data) - side 1.tzx" size="7833" crc="5a405113" sha1="776feffdd02c68572a03cdb701dedc0a4385272d"/>
@@ -97699,17 +98078,6 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="morrisme_a" cloneof="morrisme">
-		<description>Morris Meets The Bikers</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="23568">
-				<rom name="morris meets the bikers.tzx" size="23568" crc="587f7942" sha1="83f334ae491dc4388b44faac41e3a0f8012a5895"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="morsecod">
 		<description>Morse Code Tutor (Technical Software)</description>
 		<year>1987</year>
@@ -97920,12 +98288,10 @@ license:CC0
 		</part>
 	</software>
 
-
-
 	<software name="motormas">
 		<description>Motor Massacre</description>
 		<year>1989</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="95871">
 				<rom name="motor massacre - side a.tzx" size="95871" crc="d07bf385" sha1="b76e307254ce0261b4ff630d3ad9e35e0127238b"/>
@@ -99388,7 +99754,7 @@ license:CC0
 	<software name="mutants">
 		<description>Mutants (set 1)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="54979">
 				<rom name="mutants - side 1.tzx" size="54979" crc="5f7e35a2" sha1="0e4336b9406942390058dae1313dd260689fb902"/>
@@ -99404,7 +99770,7 @@ license:CC0
 	<software name="mutantser" cloneof="mutants">
 		<description>Mutants (set 2, Erbe)</description>
 		<year>1987</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50677">
 				<rom name="mutants - side 1 (erbe).tzx" size="50677" crc="c613af15" sha1="bdea1a850ccb1169032b14f2f72237e4f8e0ba7b"/>
@@ -99625,9 +99991,9 @@ license:CC0
 
 
 	<software name="myth">
-		<description>Myth - History In The Making (set 1)</description>
+		<description>Myth - History in the Making</description>
 		<year>1989</year>
-		<publisher>System 3 Software Ltd</publisher>
+		<publisher>System 3 Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="201203">
 				<rom name="myth - history in the making.tzx" size="201203" crc="697f0108" sha1="7bdfbeeea03db0c4a6d908f14f9ba6b63e2d30d7"/>
@@ -99636,9 +100002,9 @@ license:CC0
 	</software>
 
 	<software name="mythk" cloneof="myth">
-		<description>Myth - History In The Making (set 2, Kixx)</description>
+		<description>Myth - History in the Making (Kixx)</description>
 		<year>1989</year>
-		<publisher>System 3 Software Ltd / Kixx</publisher>
+		<publisher>Kixx</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="200892">
 				<rom name="myth - history in the making (kixx).tzx" size="200892" crc="9be463f5" sha1="5bc52f29c9f377074bef1e1c075baa7ab8a64b36"/>
@@ -99647,9 +100013,9 @@ license:CC0
 	</software>
 
 	<software name="mythm" cloneof="myth">
-		<description>Myth - History In The Making (set 3, MCM)</description>
+		<description>Myth - History in the Making (MCM)</description>
 		<year>1989</year>
-		<publisher>System 3 Software Ltd / MCM</publisher>
+		<publisher>MCM</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="195782">
 				<rom name="myth - side 1 (mcm).tzx" size="195782" crc="1089e515" sha1="226ddd98ba365901341aaa564f9241a614a075ae"/>
@@ -100789,7 +101155,7 @@ license:CC0
 	<software name="nywarr">
 		<description>New York Warriors</description>
 		<year>1990</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="31412">
 				<rom name="new york warriors - side a.tzx" size="31412" crc="f1bddb3f" sha1="a55038927e139459bc48b09b3451b9c980d20409"/>
@@ -102295,6 +102661,17 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="objelysee">
+		<description>Objectif Élysée</description>
+		<year>1984</year>
+		<publisher>ERE Informatique</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="55041">
+				<rom name="Objectif Elysee - ERE.tzx" size="55041" crc="a47337f0" sha1="3c339120df5ff278233c73e33156914206a8beaf"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="oblitera">
 		<description>Obliterator (Dro Soft)</description>
 		<year>1989</year>
@@ -103633,13 +104010,13 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="orfeussi">
-		<description>Orfeus (Sintech)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="ordlek">
+		<description>Ordlek</description>
+		<year>1984</year>
+		<publisher>Aschehoug</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="36130">
-				<rom name="orfeus (sintech).tzx" size="36130" crc="1bd3f509" sha1="dfe2dc0db6c8cb64d1fd1ce51cb76f4d6d35187f"/>
+			<dataarea name="cass" size="30962">
+				<rom name="Ordlek - Aschehoug.tzx" size="30962" crc="9807dc29" sha1="934bbf151bb2a8352102da6c198c33656b9db5f9"/>
 			</dataarea>
 		</part>
 	</software>
@@ -103655,6 +104032,17 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="orfeussi">
+		<description>Orfeus (Sintech)</description>
+		<year>19??</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="36130">
+				<rom name="orfeus (sintech).tzx" size="36130" crc="1bd3f509" sha1="dfe2dc0db6c8cb64d1fd1ce51cb76f4d6d35187f"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="organmas">
 		<description>Organ Master</description>
 		<year>1986</year>
@@ -105443,6 +105831,17 @@ license:CC0
 	</software>
 
 	<software name="penetrat">
+		<description>Penetrator</description>
+		<year>1983</year>
+		<publisher>Melbourne House</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="40068">
+				<rom name="penetrator.tzx" size="40068" crc="a099a7a3" sha1="eeee7c2f5f41447e1cee5f583994e4d4a1dec869"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="penetrata" cloneof="penetrat">
 		<description>Penetrator (Microbyte)</description>
 		<year>1987</year>
 		<publisher>Microbyte</publisher>
@@ -105452,14 +105851,14 @@ license:CC0
 			</dataarea>
 		</part>
 	</software>
-
-	<software name="penetrat_a" cloneof="penetrat">
-		<description>Penetrator</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	
+	<software name="penetratb" cloneof="penetrat">
+		<description>Penetrator (Investronica)</description>
+		<year>1983</year>
+		<publisher>Investronica</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="40068">
-				<rom name="penetrator.tzx" size="40068" crc="a099a7a3" sha1="eeee7c2f5f41447e1cee5f583994e4d4a1dec869"/>
+			<dataarea name="cass" size="40088">
+				<rom name="Penetrator (Investronica).tzx" size="40088" crc="fb581287" sha1="972a4fca04d6da4a21aa2669cf6e36e323764266"/>
 			</dataarea>
 		</part>
 	</software>
@@ -105529,17 +105928,6 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="perigosn">
-		<description>Perigos Na Selva</description>
-		<year>1983</year>
-		<publisher>TMX Portugal</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="23070">
-				<rom name="perigos na selva.tzx" size="23070" crc="61c78a5f" sha1="c5b5c0a590164db3f7f4f6d35c8d5327a804580e"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="perilsof">
 		<description>Perils Of Bear George (MCI)</description>
 		<year>1984</year>
@@ -106045,8 +106433,8 @@ license:CC0
 
 	<software name="phoenixz_a" cloneof="phoenixz">
 		<description>Phoenix (Zenobi)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1991</year>
+		<publisher>Zenobi Software</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="37763">
 				<rom name="phoenix (zenobi).tzx" size="37763" crc="ebb6244c" sha1="68b5880ba4ac67c72253708ecdfcd1d83cb6f825"/>
@@ -106054,6 +106442,17 @@ license:CC0
 		</part>
 	</software>
 
+	<software name="phonex">
+		<description>Phonex</description>
+		<year>19??</year>
+		<publisher>Rebit Computer</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="31748">
+				<rom name="Phonex - Rebit Computer.tzx" size="31748" crc="90ee4267" sha1="74111d94eec7237e30c2cf046fbc4dd98277e851"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="photofin">
 		<description>Photo Finish</description>
 		<year>1984</year>
@@ -106745,9 +107144,9 @@ license:CC0
 	</software>
 
 	<software name="pitfight">
-		<description>Pit-Fighter (set 1)</description>
+		<description>Pit-Fighter</description>
 		<year>1991</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="97094">
 				<rom name="pit-fighter - side a.tzx" size="97094" crc="7d533749" sha1="a461d088f50d44e3ebcf13f602c9bed941738895"/>
@@ -106760,10 +107159,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="pitfighths" cloneof="pitfight">
-		<description>Pit-Fighter (set 2, The Hit Squad)</description>
+	<software name="pitfighta" cloneof="pitfight">
+		<description>Pit-Fighter (The Hit Squad)</description>
 		<year>1991</year>
-		<publisher>Domark Ltd / The Hit Squad</publisher>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="96950">
 				<rom name="pit-fighter - side 1 (the hit squad).tzx" size="96950" crc="cf178b22" sha1="f01d05f98559628e4798ad1cdeeec8ab34537aad"/>
@@ -106893,25 +107292,20 @@ license:CC0
 	</software>
 
 	<software name="platoon">
-		<description>Platoon (set 1, release 2)</description>
+		<description>Platoon (128K)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd</publisher>
-		<part name="cass1" interface="spectrum_cass">
-			<dataarea name="cass" size="112889">
-				<rom name="platoon - release 2 - side a.tzx" size="112889" crc="f9727bd5" sha1="4069c747ff58f5e1243889801ef92e9ecdd75fd9"/>
-			</dataarea>
-		</part>
-		<part name="cass2" interface="spectrum_cass">
-			<dataarea name="cass" size="90426">
-				<rom name="platoon - release 2 - side b.tzx" size="90426" crc="fe36101b" sha1="099d831f83cca9a2f578e805560586940340c21a"/>
+		<publisher>Ocean</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="112781">
+				<rom name="Platoon - 128k.tzx" size="112781" crc="ff62eeff" sha1="b9c0499559330609c6e7c6ce009092e275f6e55a"/>
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="platoona" cloneof="platoon">
-		<description>Platoon (set 2, release 1)</description>
+		<description>Platoon (48K, release 1)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="118167">
 				<rom name="platoon - release 1 - side a.tzx" size="118167" crc="ce253896" sha1="aa56c7842831a5f43a84995ab60aac54f0925dc0"/>
@@ -106924,10 +107318,26 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="platoonhs" cloneof="platoon">
-		<description>Platoon (set 3, The Hit Squad)</description>
+	<software name="platoonb" cloneof="platoon">
+		<description>Platoon (48K, release 2)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd / The Hit Squad</publisher>
+		<publisher>Ocean</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="112889">
+				<rom name="platoon - release 2 - side a.tzx" size="112889" crc="f9727bd5" sha1="4069c747ff58f5e1243889801ef92e9ecdd75fd9"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="90426">
+				<rom name="platoon - release 2 - side b.tzx" size="90426" crc="fe36101b" sha1="099d831f83cca9a2f578e805560586940340c21a"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="platoonhs" cloneof="platoon">
+		<description>Platoon (The Hit Squad)</description>
+		<year>1990</year>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="112412">
 				<rom name="platoon (the hit squad) - side 1.tzx" size="112412" crc="58095a22" sha1="88bec41b5713a957af20ee8822c9e9ea187ec753"/>
@@ -106941,9 +107351,9 @@ license:CC0
 	</software>
 
 	<software name="platoonhse" cloneof="platoon">
-		<description>Platoon (set 4, The Hit Squad, Erbe)</description>
+		<description>Platoon (IBSA)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd / The Hit Squad / Erbe</publisher>
+		<publisher>IBSA</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="108780">
 				<rom name="platoon (erbe - the hit squad).tzx" size="108780" crc="6d186fb2" sha1="9b1278b1079aa59dafde3a8bb1b9723460801a95"/>
@@ -106952,9 +107362,9 @@ license:CC0
 	</software>
 
 	<software name="platoone" cloneof="platoon">
-		<description>Platoon (set 5, Erbe)</description>
+		<description>Platoon (Erbe)</description>
 		<year>1988</year>
-		<publisher>Ocean Software Ltd / Erbe</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="108821">
 				<rom name="platoon - side 1 (erbe).tzx" size="108821" crc="206863a5" sha1="780eb87fc1fba1559fce55263a705bab74fc053c"/>
@@ -111216,7 +111626,7 @@ license:CC0
 	<software name="racingma">
 		<description>Racing Manager</description>
 		<year>1983</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="38905">
 				<rom name="racing manager.tzx" size="38905" crc="42b19596" sha1="1c44d755abc4ede204048d3de53b32a15cdfbed1"/>
@@ -112355,7 +112765,7 @@ license:CC0
 	<software name="rebel">
 		<description>Rebel (set 1)</description>
 		<year>1987</year>
-		<publisher>Virgin Games Ltd</publisher>
+		<publisher>Virgin Games</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="56855">
 				<rom name="rebel.tzx" size="56855" crc="d42ee24d" sha1="bd1a229b89c2b70aff5bea6f3d9598cbd59feeed"/>
@@ -112926,33 +113336,6 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="rwitchl">
-		<description>Return Of The Witch Lord</description>
-		<year>1991</year>
-		<publisher>Gremlin Graphics Software</publisher>
-		<part name="cass1" interface="spectrum_cass">
-			<dataarea name="cass" size="105971">
-				<rom name="return of the witch lord - side 1.tzx" size="105971" crc="ce90c8ab" sha1="81df97e582eb921a321a6c15b5d9ecefcbdc6460"/>
-			</dataarea>
-		</part>
-		<part name="cass2" interface="spectrum_cass">
-			<dataarea name="cass" size="105754">
-				<rom name="return of the witch lord - side 2.tzx" size="105754" crc="7d994180" sha1="932068f1b26339d699537c12c714253ce83c9097"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="rwitchld" cloneof="rwitchl">
-		<description>Return Of The Witch Lord (Dro Soft re-release)</description>
-		<year>1991</year>
-		<publisher>Dro Soft</publisher>
-		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="106012">
-				<rom name="return of the witch lord (dro soft).tzx" size="106012" crc="56f2cf41" sha1="1ea72d0fa33c3aa8a4a110cf171286c3eb5db76a"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="reteartha" cloneof="retearth">
 		<description>Return To Earth (set 2)</description>
 		<year>1982</year>
@@ -115978,20 +116361,20 @@ license:CC0
 	</software>
 
 	<software name="salamand">
-		<description>Salamander (Erbe)</description>
-		<year>1988</year>
-		<publisher>Erbe Software</publisher>
+		<description>Salamander</description>
+		<year>1987</year>
+		<publisher>Konami</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="55134">
-				<rom name="salamander (erbe).tzx" size="55134" crc="91994396" sha1="11a305d3cc3855102c359ad8a8f493147a942d40"/>
+			<dataarea name="cass" size="60001">
+				<rom name="salamander.tzx" size="60001" crc="bbdf4c05" sha1="5089671a3561753f39002c8519350528fca28fc6"/>
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="salamand_a" cloneof="salamand">
 		<description>Salamander (Imagine)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1987</year>
+		<publisher>Imagine</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="45860">
 				<rom name="salamander (imagine).tzx" size="45860" crc="5d4b0391" sha1="d902b7ccf819d049bff80539e3ba5a0af9ab1ce0"/>
@@ -116001,8 +116384,8 @@ license:CC0
 
 	<software name="salamand_b" cloneof="salamand">
 		<description>Salamander (The Hit Squad)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1990</year>
+		<publisher>The Hit Squad</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47880">
 				<rom name="salamander (the hit squad).tzx" size="47880" crc="d8ab4613" sha1="9fcd4df7633b816bc6a02262f50e34fd627835a7"/>
@@ -116011,12 +116394,12 @@ license:CC0
 	</software>
 
 	<software name="salamand_c" cloneof="salamand">
-		<description>Salamander</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<description>Salamander (Erbe)</description>
+		<year>1988</year>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="60001">
-				<rom name="salamander.tzx" size="60001" crc="bbdf4c05" sha1="5089671a3561753f39002c8519350528fca28fc6"/>
+			<dataarea name="cass" size="55134">
+				<rom name="salamander (erbe).tzx" size="55134" crc="91994396" sha1="11a305d3cc3855102c359ad8a8f493147a942d40"/>
 			</dataarea>
 		</part>
 	</software>
@@ -116133,6 +116516,22 @@ license:CC0
 	</software>
 
 	<software name="samurait">
+		<description>Samurai Trilogy</description>
+		<year>1987</year>
+		<publisher>Gremlin Graphics</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="28411">
+				<rom name="samurai trilogy - side a.tzx" size="28411" crc="212ffe40" sha1="ea7687aba4264bf147a22d5b9d92b5b38666c3a2"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="120174">
+				<rom name="samurai trilogy - side b.tzx" size="120174" crc="ba71c659" sha1="59dc24dfd7c830bc2626579a51d8731d7f139ce8"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="samuraita" cloneof="samurait">
 		<description>Samurai Trilogy (Kixx)</description>
 		<year>1987</year>
 		<publisher>Kixx</publisher>
@@ -116148,10 +116547,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="samurait_b" cloneof="samurait">
+	<software name="samuraitb" cloneof="samurait">
 		<description>Samurai Trilogy (Erbe)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1987</year>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="28342">
 				<rom name="samurai trilogy - side 1 (erbe).tzx" size="28342" crc="bc6a7dae" sha1="bf67f48278bd9bc9b0d1a18699c8438ad9602457"/>
@@ -116164,22 +116563,6 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="samurait_d" cloneof="samurait">
-		<description>Samurai Trilogy</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="cass1" interface="spectrum_cass">
-			<dataarea name="cass" size="28411">
-				<rom name="samurai trilogy - side a.tzx" size="28411" crc="212ffe40" sha1="ea7687aba4264bf147a22d5b9d92b5b38666c3a2"/>
-			</dataarea>
-		</part>
-		<part name="cass2" interface="spectrum_cass">
-			<dataarea name="cass" size="120174">
-				<rom name="samurai trilogy - side b.tzx" size="120174" crc="ba71c659" sha1="59dc24dfd7c830bc2626579a51d8731d7f139ce8"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="samuraiw">
 		<description>Samurai Warrior (MC Lothlorien)</description>
 		<year>1982</year>
@@ -117864,7 +118247,7 @@ license:CC0
 	<software name="shadbeas">
 		<description>Shadow Of The Beast (set 1)</description>
 		<year>1990</year>
-		<publisher>Gremlin Graphics Software Ltd</publisher>
+		<publisher>Gremlin Graphics Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="31222">
 				<rom name="shadow of the beast - side 1.tzx" size="31222" crc="4294186a" sha1="c9539e25593545f258fa90ed0b1f546613c7691f"/>
@@ -124360,7 +124743,7 @@ license:CC0
 	<software name="spitting">
 		<description>Spitting Image</description>
 		<year>1988</year>
-		<publisher>Domark Ltd</publisher>
+		<publisher>Domark</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="37955">
 				<rom name="spitting image - side 1.tzx" size="37955" crc="2105ddcc" sha1="81b87b00007e10d6785244ac579fdebe5afac07a"/>
@@ -127228,6 +127611,22 @@ license:CC0
 	</software>
 
 	<software name="supercar">
+		<description>Super Cars</description>
+		<year>1990</year>
+		<publisher>Gremlin Graphics</publisher>
+		<part name="cass1" interface="spectrum_cass">
+			<dataarea name="cass" size="74336">
+				<rom name="super cars - side 1.tzx" size="74336" crc="7c0c9e0d" sha1="15bc5b374aa5b98c06c3b59b4cfd95d1d88ae5c2"/>
+			</dataarea>
+		</part>
+		<part name="cass2" interface="spectrum_cass">
+			<dataarea name="cass" size="64462">
+				<rom name="super cars - side 2.tzx" size="64462" crc="135a9a33" sha1="599aa96c91a92435607b506ac1c74c7d936e8172"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="supercara" cloneof="supercar">
 		<description>Super Cars (GBH)</description>
 		<year>1990</year>
 		<publisher>GBH</publisher>
@@ -127243,18 +127642,18 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="supercar_a" cloneof="supercar">
-		<description>Super Cars</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="supercarb" cloneof="supercar">
+		<description>Super Cars (Erbe)</description>
+		<year>1990</year>
+		<publisher>Erbe Software</publisher>
 		<part name="cass1" interface="spectrum_cass">
-			<dataarea name="cass" size="74336">
-				<rom name="super cars - side 1.tzx" size="74336" crc="7c0c9e0d" sha1="15bc5b374aa5b98c06c3b59b4cfd95d1d88ae5c2"/>
+			<dataarea name="cass" size="52025">
+				<rom name="super cars - side 1 (erbe).tzx" size="52025" crc="77ff22ba" sha1="8fa39ddffb9dbc4fbb6973f0d2149cb76218d541"/>
 			</dataarea>
 		</part>
 		<part name="cass2" interface="spectrum_cass">
-			<dataarea name="cass" size="64462">
-				<rom name="super cars - side 2.tzx" size="64462" crc="135a9a33" sha1="599aa96c91a92435607b506ac1c74c7d936e8172"/>
+			<dataarea name="cass" size="81198">
+				<rom name="super cars - side 2 (erbe).tzx" size="81198" crc="aac6f850" sha1="70e4a724ceda6712d56b8c1403b6de5ac4ee86b4"/>
 			</dataarea>
 		</part>
 	</software>
@@ -131390,8 +131789,8 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="testdriv">
-		<description>Test Drive 2 - The Duel</description>
+	<software name="td2">
+		<description>Test Drive II: The Duel</description>
 		<year>1989</year>
 		<publisher>Accolade</publisher>
 		<part name="cass" interface="spectrum_cass">
@@ -131401,10 +131800,10 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="testdriv_a" cloneof="testdriv">
-		<description>Test Drive II - The Duel (Dro Soft)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+	<software name="td2a" cloneof="td2">
+		<description>Test Drive II: The Duel (Dro Soft)</description>
+		<year>1990</year>
+		<publisher>Dro Soft</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="47057">
 				<rom name="test drive ii - the duel (dro soft).tzx" size="47057" crc="7bc9d285" sha1="757a632e1f65bfff1773072067a438cdeec5e965"/>
@@ -136760,31 +137159,31 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="uridiume">
-		<description>Uridium (Erbe)</description>
-		<year>1986</year>
-		<publisher>Erbe Software</publisher>
+	<software name="uridiump">
+		<description>Uridium Plus</description>
+		<year>1987</year>
+		<publisher>Hewson Consultants</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="51012">
-				<rom name="uridium (erbe).tzx" size="51012" crc="9ed30fe2" sha1="299a052996b2c9f24f0b11d412a99b9aed0b2f39"/>
+			<dataarea name="cass" size="49837">
+				<rom name="uridium plus.tzx" size="49837" crc="09d9e37e" sha1="7d9db8097d2ca64e28f432f02eac0f69ec58bab3"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="uridiumr">
-		<description>Uridium (Rack-It)</description>
-		<year>1988</year>
-		<publisher>Rack-It</publisher>
+	<software name="uridium">
+		<description>Uridium (set 1)</description>
+		<year>1986</year>
+		<publisher>Hewson Consultants</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="50016">
-				<rom name="uridium (rack-it).tzx" size="50016" crc="d9062c6e" sha1="0fa866541909f50303348db1f1013e4990ed0a0d"/>
+			<dataarea name="cass" size="49867">
+				<rom name="uridium.tzx" size="49867" crc="cee5122e" sha1="06a470d54036764c937293d3c4927a7303e46213"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="uridiuma">
-		<description>Uridium (set 2)</description>
-		<year>1986</year>
+	<software name="uridiuma" cloneof="uridium">
+		<description>Uridium (set 2 - alternative)</description>
+		<year>1987</year>
 		<publisher>Hewson Consultants</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="50019">
@@ -136798,24 +137197,35 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="uridiump">
-		<description>Uridium Plus</description>
-		<year>1987</year>
-		<publisher>Hewson Consultants</publisher>
+	<software name="uridiumb" cloneof="uridium">
+		<description>Uridium (Erbe - medium case)</description>
+		<year>1986</year>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="49837">
-				<rom name="uridium plus.tzx" size="49837" crc="09d9e37e" sha1="7d9db8097d2ca64e28f432f02eac0f69ec58bab3"/>
+			<dataarea name="cass" size="51012">
+				<rom name="uridium (erbe).tzx" size="51012" crc="9ed30fe2" sha1="299a052996b2c9f24f0b11d412a99b9aed0b2f39"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="uridium">
-		<description>Uridium</description>
+	<software name="uridiumc" cloneof="uridium">
+		<description>Uridium (Erbe - small case)</description>
 		<year>1986</year>
-		<publisher>Hewson Consultants</publisher>
+		<publisher>Erbe Software</publisher>
 		<part name="cass" interface="spectrum_cass">
-			<dataarea name="cass" size="49867">
-				<rom name="uridium.tzx" size="49867" crc="cee5122e" sha1="06a470d54036764c937293d3c4927a7303e46213"/>
+			<dataarea name="cass" size="51172">
+				<rom name="Uridium - Small Case (Erbe).tzx" size="51172" crc="e0706356" sha1="44b31486f7edaea9cbcb71674c6e2fcbae456106"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="uridiumd">
+		<description>Uridium (Rack-It)</description>
+		<year>1988</year>
+		<publisher>Rack-It</publisher>
+		<part name="cass" interface="spectrum_cass">
+			<dataarea name="cass" size="50016">
+				<rom name="uridium (rack-it).tzx" size="50016" crc="d9062c6e" sha1="0fa866541909f50303348db1f1013e4990ed0a0d"/>
 			</dataarea>
 		</part>
 	</software>
@@ -138935,7 +139345,7 @@ license:CC0
 	<software name="wizardtal">
 		<description>The Wizard of Tallyron</description>
 		<year>1986</year>
-		<publisher>C &amp; VG</publisher>
+		<publisher>C&amp;VG</publisher>
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="36911">
 				<rom name="the wizard of tallyron.tzx" size="36911" crc="9e5b2dd2" sha1="c95729658f9d1c9e46951f7a2de8894fc69766fe"/>
@@ -147451,7 +147861,7 @@ license:CC0
 	<software name="arcadiao">
 		<description>Arcadia (Ocean Software, compilation)</description>
 		<year>1989</year>
-		<publisher>Ocean Software Ltd</publisher>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="162739">
 				<rom name="arcadia - chase hq.tzx" size="162739" crc="c25e6031" sha1="6a988d6b8a4e948e8b8ccd9b3ccdcbedfd3d4e10"/>
@@ -151780,32 +152190,6 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="hqtwin">
-		<description>Hero Quest Twin Pack</description>
-		<year>1991</year>
-		<publisher>Gremlin Graphics Software</publisher>
-		<part name="cass1" interface="spectrum_cass">
-			<dataarea name="cass" size="111943">
-				<rom name="hero quest twin pack - tape 1 - side 1.tzx" size="111943" crc="89e050d1" sha1="e526e77b5a4f9b930616cbcc46f5694faeb8d8a1"/>
-			</dataarea>
-		</part>
-		<part name="cass2" interface="spectrum_cass">
-			<dataarea name="cass" size="137616">
-				<rom name="hero quest twin pack - tape 1 - side 2.tzx" size="137616" crc="b14cb6f5" sha1="754feba0a213d858b8782066f0bb1edd0eff476f"/>
-			</dataarea>
-		</part>
-		<part name="cass3" interface="spectrum_cass">
-			<dataarea name="cass" size="105871">
-				<rom name="hero quest twin pack - tape 2 - side 1.tzx" size="105871" crc="9769c43b" sha1="b3a53e2835c142f250c83dde524419ecd1ff6cf4"/>
-			</dataarea>
-		</part>
-		<part name="cass4" interface="spectrum_cass">
-			<dataarea name="cass" size="105655">
-				<rom name="hero quest twin pack - tape 2 - side 2.tzx" size="105655" crc="fd2dfa0d" sha1="ce6dc2da99456453d54c3e712553b99120ae8a35"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="heroesta">
 		<description>Heroes (compilation)</description>
 		<year>1990</year>
@@ -159255,8 +159639,8 @@ license:CC0
 
 	<software name="dreamtap">
 		<description>The Dream Team</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1993</year>
+		<publisher>Ocean</publisher>
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="172374">
 				<rom name="the dream team - tape 1 - the simpsons - side 1.tzx" size="172374" crc="2c78dfbd" sha1="57a002e57a3d24e70c963554c785e1158da47818"/>