diff --git a/hash/mbee_cass.xml b/hash/mbee_cass.xml
index 99235c23d67..4fd8fde7890 100644
--- a/hash/mbee_cass.xml
+++ b/hash/mbee_cass.xml
@@ -11,8 +11,6 @@ Compatibility flags:
 
 If no flag is specified, it's assumed it works on all of them.
 
-The tapes in this list are here because they do not exist as quickloads.
-
 They do not work on disk-based microbees, or on premium models.
 
 -->
diff --git a/hash/trs80_cass.xml b/hash/trs80_cass.xml
index eeba037744b..508f7d71af9 100644
--- a/hash/trs80_cass.xml
+++ b/hash/trs80_cass.xml
@@ -11,7 +11,7 @@ Compatibility flags:
 3 = trs80m3
 4 = trs80m4
 H = HT series
-M = meritum
+
 
 If no flag is specified, it's assumed it works on all of them.
 
@@ -25,39 +25,13 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
 -->
 <softwarelist name="trs80_cass" description="Radio Shack TRS-80 cassettes">
 
-	<software name="android">
-		<description>Android Nim</description>
-		<year>1978</year>
-		<publisher>80-NW Publishing Co</publisher>
-		<info name="author" value="Leo Christopherson" />
-		<info name="usage" value="(Model 3/4: Answer L at Cass? prompt) CLOAD then RUN" />
-		<sharedfeat name="compatibility" value="1,3,4,H" />
-		<part name="cass1" interface="trs80_cass">
-			<dataarea name="cass" size="0x3785">
-				<rom name="android1.cas" size="0x3785" crc="4f72e456" sha1="d53a619c8f3d734f08db6ade979cdb267097e2cf"/>
-			</dataarea>
-		</part>
-	</software>
-	<software name="meteor2">
-		<description>Meteor Mission 2</description>
-		<year>1982</year>
-		<publisher>Big Five Software</publisher>
-		<info name="author" value="Bill Hogue and Jeff Konyu" />
-		<info name="usage" value="(Model 3/4: Answer L at Cass? prompt) SYSTEM then METEOR then /" />
-		<sharedfeat name="compatibility" value="1,3,4,H" /><!-- Graphics are better on 3,4 -->
-		<part name="cass1" interface="trs80_cass">
-			<dataarea name="cass" size="0x2ff8">
-				<rom name="meteor2.cas" size="0x2ff8" crc="144417c0" sha1="26b441bd494ddbce478239c1727087e64a95e447"/>
-			</dataarea>
-		</part>
-	</software>
 	<software name="chess0">
 		<description>MicroChess 1.5 (L1)</description>
 		<year>1978</year>
 		<publisher>Micro-ware Limited</publisher>
-		<info name="usage" value="CLOAD then RUN" />
+		<info name="usage" value="Enter, CLOAD then RUN" />
 		<sharedfeat name="compatibility" value="0" />
-		<part name="cass1" interface="trs80_cass">
+		<part name="cass" interface="trs80_cass">
 			<dataarea name="cass" size="0x148b">
 				<rom name="chess0.cas" size="0x148b" crc="b8a1a3ae" sha1="937c25f5295edd00a90bfe828615ba5e2470b9dd"/>
 			</dataarea>
@@ -67,9 +41,9 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
 		<description>Haunted House (L1)</description>
 		<year>1980</year>
 		<publisher>Tandy Corporation</publisher>
-		<info name="usage" value="CLOAD then when it says HAUNTED HOUSE hit Enter" />
+		<info name="usage" value="Enter, CLOAD then when it says HAUNTED HOUSE hit Enter" />
 		<sharedfeat name="compatibility" value="0" />
-		<part name="cass1" interface="trs80_cass">
+		<part name="cass" interface="trs80_cass">
 			<dataarea name="cass" size="0x1ae3">
 				<rom name="haunt0.cas" size="0x1ae3" crc="40554978" sha1="d8d6c8a2f482bc1f7c6e6c49a510979f9f9139d9"/>
 			</dataarea>
@@ -79,9 +53,9 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
 		<description>Invasion Force (L1)</description>
 		<year>1979</year>
 		<publisher>Tandy Corporation</publisher>
-		<info name="usage" value="CLOAD" />
+		<info name="usage" value="Enter, CLOAD" />
 		<sharedfeat name="compatibility" value="0" />
-		<part name="cass1" interface="trs80_cass">
+		<part name="cass" interface="trs80_cass">
 			<dataarea name="cass" size="0x2287">
 				<rom name="invasion0.cas" size="0x2287" crc="d40c1134" sha1="aea9a587d9040cff153c8be219ed4591a794524c"/>
 			</dataarea>
@@ -91,9 +65,9 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
 		<description>TRS-80 Marquee (L1)</description>
 		<year>1979</year>
 		<publisher>Tandy Corporation</publisher>
-		<info name="usage" value="CLOAD" />
+		<info name="usage" value="Enter, CLOAD" />
 		<sharedfeat name="compatibility" value="0" />
-		<part name="cass1" interface="trs80_cass">
+		<part name="cass" interface="trs80_cass">
 			<dataarea name="cass" size="0x069f">
 				<rom name="marquee0.cas" size="0x069f" crc="46c8ba18" sha1="a1edef26cfb996d8f150e0ca9e5212a8de6c4aef"/>
 			</dataarea>
@@ -103,9 +77,9 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
 		<description>Quick Watson (L1)</description>
 		<year>1978</year>
 		<publisher>Radio Shack</publisher>
-		<info name="usage" value="CLOAD then RUN" />
+		<info name="usage" value="Enter, CLOAD then RUN" />
 		<sharedfeat name="compatibility" value="0" />
-		<part name="cass1" interface="trs80_cass">
+		<part name="cass" interface="trs80_cass">
 			<dataarea name="cass" size="0x0c5b">
 				<rom name="qwatson0.cas" size="0x0c5b" crc="196e5e75" sha1="a65fb3144b71d377632240548cdeb875e6537d8d"/>
 			</dataarea>
@@ -116,13 +90,273 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
 		<year>1979</year>
 		<publisher>Radio Shack</publisher>
 		<info name="author" value="Robert Arnstein" />
-		<info name="usage" value="CLOAD then RUN" />
+		<info name="usage" value="Enter, CLOAD then RUN" />
 		<sharedfeat name="compatibility" value="0" />
-		<part name="cass1" interface="trs80_cass">
-			<dataarea name="cass" size="0e8b">
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x0e8b">
 				<rom name="saucer0.cas" size="0x0e8b" crc="257f8f52" sha1="5c46fc89edab7f5a55706ab18c9315aa7b2f3d28"/>
 			</dataarea>
 		</part>
 	</software>
+	<software name="android">
+		<description>Android Nim</description>
+		<year>1978</year>
+		<publisher>80-NW Publishing Co</publisher>
+		<info name="author" value="Leo Christopherson" />
+		<info name="usage" value="(Model 3/4: Answer L at Cass? prompt), Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x3785">
+				<rom name="android1.cas" size="0x3785" crc="4f72e456" sha1="d53a619c8f3d734f08db6ade979cdb267097e2cf"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="colliss">
+		<description>Collission</description>
+		<year>1979</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<info name="author" value="David Bohlke" />
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x0ac3">
+				<rom name="autozas.cas" size="0x0ac3" crc="2ce1c3ca" sha1="5172fd0540e1a0c21530682f87ef21abdd73f169"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="baccarat">
+		<description>Baccarat</description>
+		<year>1979</year>
+		<publisher>Radio Shack</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x2b53">
+				<rom name="baccarat.cas" size="0x2b53" crc="f7c12e3a" sha1="022e9df94542ae9012e5903c5eceeaba554600b4"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="backgamm">
+		<description>Backgammon</description>
+		<year>19??</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x0c6d">
+				<rom name="backgamm.cas" size="0x0c6d" crc="f191518b" sha1="771ce3df3cb48bf7ebea79a3f3ec2beb104a12af"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="blakjack">
+		<description>Blackjack</description>
+		<year>19??</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x0ba2">
+				<rom name="blackjack.cas" size="0x0ba2" crc="c16621c1" sha1="e75e527fcbfa1131e1c0eb618686bd13facd787d"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="craps">
+		<description>Reno Casino Craps</description>
+		<year>1979</year>
+		<publisher>Tandy Corp</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x2278">
+				<rom name="craps.cas" size="0x2278" crc="9e7ac665" sha1="4f26aa561b1c90c3074963a9c1fc526224ca9702"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="dslogo">
+		<description>System-80 Demo</description>
+		<year>19??</year>
+		<publisher>Dick Smith Electronics</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x0d65">
+				<rom name="dslogo.cas" size="0x0d65" crc="77cbbbf3" sha1="e901be378d78ac286fd9f4e37bdb912f795432c7"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="dtrap">
+		<description>Death Trap</description>
+		<year>19??</year>
+		<publisher>Dick Smith Electronics</publisher>
+		<info name="author" value="Michael Fackerell" />
+		<info name="usage" value="32640, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x12e9">
+				<rom name="dtrap.cas" size="0x12e9" crc="a5f283e2" sha1="ac4406c8469bf6fe54560a4273d678275fc7dd4e"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="keno">
+		<description>Reno Keno</description>
+		<year>19??</year>
+		<publisher>Radio Shack</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x1427">
+				<rom name="keno.cas" size="0x1427" crc="0db78e54" sha1="fed04ea2f4a63ceb651fb6fbc5ba19584583f85f"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="meteor2">
+		<description>Meteor Mission 2</description>
+		<year>1982</year>
+		<publisher>Big Five Software</publisher>
+		<info name="author" value="Bill Hogue and Jeff Konyu" />
+		<info name="usage" value="(Model 3/4: Answer L at Cass? prompt), Enter, SYSTEM then METEOR then /" />
+		<sharedfeat name="compatibility" value="1,3,4,H" /><!-- Graphics are better on 3,4 -->
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x2ff8">
+				<rom name="meteor2.cas" size="0x2ff8" crc="144417c0" sha1="26b441bd494ddbce478239c1727087e64a95e447"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="microply">
+		<description>Micro-opoly</description>
+		<year>1979</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<info name="author" value="Douglas Perrin" />
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x32f1">
+				<rom name="microply.cas" size="0x32f1" crc="c9da3313" sha1="cfb8f1312de710f297c09f5e188a3ea6bf78895b"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="qwatson">
+		<description>Quick Watson</description>
+		<year>1978</year>
+		<publisher>Radio Shack</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x0bb4">
+				<rom name="qwatson.cas" size="0x0bb4" crc="f185d97a" sha1="332dec055c615cf5aea92f093bf3fb0767cf8ec5"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="roulette">
+		<description>Reno Casino Roulette</description>
+		<year>19??</year>
+		<publisher>Radio Shack</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x2353">
+				<rom name="roulette.cas" size="0x2353" crc="87efc863" sha1="8eb3b5fffe3169591848aba58b01e2a6591ce6fa"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="pinball">
+		<description>Micro-80 Pinball Machine</description>
+		<year>1980</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<info name="author" value="G.R.Jensen" />
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x21e5">
+				<rom name="pinball.cas" size="0x21e5" crc="86a16262" sha1="e2f84cc05a675a82a360091cf5c53f53c9f0accf"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="slot">
+		<description>Reno Casino Slot Machine</description>
+		<year>19??</year>
+		<publisher>Radio Shack</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x15fe">
+				<rom name="slot.cas" size="0x15fe" crc="1b0d4944" sha1="abf542b2bb8690c1878b9a4a27fc35145d72efa0"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="startrek">
+		<description>Star Trek (The Computer Game)</description>
+		<year>19??</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x360f">
+				<rom name="startrek.cas" size="0x360f" crc="6e3f370f" sha1="61ce2862e66d5be93d8ad4416f14ef74d65a1c70"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="starwar">
+		<description>Star War</description>
+		<year>19??</year>
+		<publisher>EACA International</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x20fa">
+				<rom name="starwar.cas" size="0x20fa" crc="0f5d20f3" sha1="343a5551b297d8959f4a4b7a34c717a576a46dc5"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="taipan">
+		<description>Taipan</description>
+		<year>1979</year>
+		<publisher>Cybernautics</publisher>
+		<info name="author" value="Art Canfil" />
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x3566">
+				<rom name="taipan.cas" size="0x3566" crc="08ab89f7" sha1="e427a18099ab2362df186403539d3a4ad8dc45df"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="trollcru">
+		<description>Troll Crusher</description>
+		<year>1981</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<info name="author" value="Simon Goodwin" />
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x396a">
+				<rom name="trollcrusher.cas" size="0x396a" crc="40409fdd" sha1="1dcf4e8d69c930aac9e49241bc915b019cef9464"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="vglogo">
+		<description>Video Genie Demo</description>
+		<year>1979</year>
+		<publisher>EACA International</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x05cd">
+				<rom name="vglogo.cas" size="0x05cd" crc="0176a408" sha1="3a258cfaad530b18fba079744985c44e7eef5cc4"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="wheel">
+		<description>Wheel of Fortune</description>
+		<year>19??</year>
+		<publisher>Radio Shack</publisher>
+		<info name="usage" value="Enter, CLOAD then RUN" />
+		<sharedfeat name="compatibility" value="1,3,4,H" />
+		<part name="cass" interface="trs80_cass">
+			<dataarea name="cass" size="0x1616">
+				<rom name="wheel.cas" size="0x1616" crc="f259ef4d" sha1="5291a7ef54a2718ffac0db2ad989821541d657b2"/>
+			</dataarea>
+		</part>
+	</software>
 
 </softwarelist>