diff --git a/hash/apple2.xml b/hash/apple2.xml
index 0c91f22cb36..83576c2bba2 100644
--- a/hash/apple2.xml
+++ b/hash/apple2.xml
@@ -582,7 +582,7 @@
 	</software>
 
 	<software name="alcazar">
-		<description>Alcazar the Forgotten  Fortress</description>
+		<description>Alcazar the Forgotten Fortress</description>
 		<year>1985</year>
 		<publisher>Activision</publisher>
 
@@ -966,13 +966,13 @@
 	</software>
 
 	<software name="aztec">
-		<description>Aztec</description>
+		<description>Aztec (clean crack)</description>
 		<year>1982</year>
 		<publisher>Datamost</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="aztec (1982)(datamost)[cr grossiers].do" size="143360" crc="aa0e78c9" sha1="9a9d639798dda33e9b591e419ea4de602ff405fb" offset="0x0000" />
+				<rom name="aztec (4am crack)" size="143360" crc="f4c40d91" sha1="71d639bb9b55369abc2ef534bab6b74a731b7e65" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -1060,13 +1060,13 @@
 	</software>
 
 	<software name="amchal">
-		<description>The American Challenge</description>
+		<description>The American Challenge (clean crack)</description>
 		<year>1986</year>
 		<publisher>MIndscape</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="american challenge, the (1986)(mindscape)[cr first class].dsk" size="143360" crc="f4320ad1" sha1="90d6b869c22f5245a16999bc0186e21bad1414b1" offset="0x0000" />
+				<rom name="american challenge, the (1986)(mindscape)(trex crack).dsk" size="143360" crc="26af56f8" sha1="89d4c5c1a232a0c6ef1960d9da0e05e626890e55" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -1867,36 +1867,19 @@
 		</part>
 	</software>
 
-	<software name="batmancr">
-		<description>Batman (crack)</description>
-		<year>1988</year>
-		<publisher>Data East</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop1" size="143360">
-				<rom name="batman (1988)(data east)(side a)[cr blade].do" size="143360" crc="aa091b36" sha1="be2ae48be4ccc2adb92d02d061829d8ce72c5a2a" offset="0x0000" />
-			</dataarea>
-		</part>
-		<part name="flop2" interface="floppy_5_25">
-			<dataarea name="flop1" size="143360">
-				<rom name="batman (1988)(data east)(side b)[cr blade].do" size="143360" crc="0aebbb48" sha1="97888412b36e2f65725a8177c46cb1d5f2a9e083" offset="0x0000" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="batman">
-		<description>Batman</description>
+		<description>Batman (clean crack)</description>
 		<year>1988</year>
 		<publisher>Data East</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop1" size="143360">
-				<rom name="batman (1988)(data east)(side a).do" size="143360" crc="03803d2c" sha1="38f1f2775b6a14740a158dc418fb1397a6160d90" offset="0x0000" />
+				<rom name="batman (1988)(data east)(side a)(4am crack).dsk" size="143360" crc="d8ddda60" sha1="456ced865c6a7f74af89e2bc1fbad0bde44fb55d" offset="0x0000" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<dataarea name="flop1" size="143360">
-				<rom name="batman (1988)(data east)(side b).do" size="143360" crc="f6edc353" sha1="90b9fccc88c7214e3c25bcb8fe65ca3e25bf4e2e" offset="0x0000" />
+				<rom name="batman (1988)(data east)(side b)(4am crack).dsk" size="143360" crc="0aebbb48" sha1="97888412b36e2f65725a8177c46cb1d5f2a9e083" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -1914,18 +1897,18 @@
 	</software>
 
 	<software name="bbblocks">
-		<description>BASIC Building Blocks (crack)</description>
+		<description>BASIC Building Blocks (clean crack)</description>
 		<year>1983</year>
 		<publisher>Micro Education</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop1" size="143360">
-				<rom name="basic building blocks (1983)(micro education)(disk 1 of 2)[cr copycatter].po" size="143360" crc="94dea7d3" sha1="77788be0e8b8c17ab1223f7c534461656652596a" offset="0x0000" />
+				<rom name="basic building blocks (1983)(micro education)(disk 1)(4am crack).dsk" size="143360" crc="a1752e9a" sha1="cfdd011756427b782935732446c27cb1caa6b8a1" offset="0x0000" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<dataarea name="flop1" size="143360">
-				<rom name="basic building blocks (1983)(micro education)(disk 2 of 2)[cr copycatter].po" size="143360" crc="fd089cd2" sha1="b7991ba3101ad50011efde9562a89ba25446f689" offset="0x0000" />
+				<rom name="basic building blocks (1983)(micro education)(disk 2)(4am crack).dsk" size="143360" crc="a51a3503" sha1="98b6d27d0da675c2f5d351340cd56f2d8d807eba" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -3764,13 +3747,13 @@
 	</software>
 
 	<software name="cogito">
-		<description>Cogito!</description>
+		<description>Cogito! (clean crack)</description>
 		<year>198??</year>
 		<publisher>Reader's Digest Software</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="cogito! (19xx)(reader's digest software)[cr soft sector].do" size="143360" crc="adce5f14" sha1="b54922baa49063b2721e4155c2ee6db479b9e438" offset="0x0000" />
+				<rom name="cogito! (19xx)(reader's digest software)(4am crack)" size="143360" crc="dab73665" sha1="fac81f70393ce06a08830913560c2e3f6e694ed0" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -3993,13 +3976,13 @@
 	</software>
 
 	<software name="crismntn">
-		<description>Crisis Mountain</description>
+		<description>Crisis Mountain (clean crack)</description>
 		<year>1982</year>
 		<publisher>Synergistic Software</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="crisis mountain (1982)(synergistic software)[cr sowbug][no boot].do" size="143360" crc="fe592264" sha1="afc45df54e078b8f1a9fd6c6d2c06c052f7a8fc6" offset="0x0000" />
+				<rom name="crisis mountain (1982)(synergistic software)(4am crack).dsk" size="143360" crc="f43e80de" sha1="1bbdbe1a89ea35dce064406b79cee8cb10da81a4" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -4797,8 +4780,8 @@
 	</software>
 
 	<software name="genesis">
-		<!-- Original disk wouldn't boot on 65C02 or later -->
 		<description>Genesis (clean crack)</description>
+		<!-- Original disk wouldn't boot on 65C02 or later -->
 		<year>1983</year>
 		<publisher>Datasoft / Design Labs</publisher>
 
@@ -4850,14 +4833,14 @@
 		</part>
 	</software>
 
-	<software name="hhgg">
-		<description>Hitchhiker's Guide to the Galaxy</description>
-		<year>1984</year>
-		<publisher>Infocom</publisher>
+	<software name="hardball">
+		<description>Hardball (clean crack)</description>
+		<year>1985</year>
+		<publisher>Accolade</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="hitchhiker's guide to the galaxy, the (1984)(infocom)[a].dsk" size="143360" crc="dc05d339" sha1="865a1634c0a5fdaef93f2e71a014b440a493f97b" offset="0x0000" />
+				<rom name="hardball (1985)(accolade)(trex crack).dsk" size="143360" crc="bfc321c3" sha1="08b9d470a0f64c6d8c078058484b85153682cd32" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -4874,6 +4857,31 @@
 		</part>
 	</software>
 
+	<software name="heist">
+		<description>The Heist (clean crack)</description>
+		<!-- High scores stored on disc, reset to AAA 5000, BBB 4000, CCC 3000, DDD 2000 & EEE 1000 -->
+		<year>1983</year>
+		<publisher>Microlab</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="the heist (1983)(microlab)(trex crack).dsk" size="143360" crc="47965be3" sha1="b050eae4631b6737d7bd8264de1544341a3a2042" offset="0x0000" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="hhgg">
+		<description>Hitchhiker's Guide to the Galaxy</description>
+		<year>1984</year>
+		<publisher>Infocom</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="hitchhiker's guide to the galaxy, the (1984)(infocom)[a].dsk" size="143360" crc="dc05d339" sha1="865a1634c0a5fdaef93f2e71a014b440a493f97b" offset="0x0000" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="hollywhj">
 		<description>Hollywood Hijinx</description>
 		<year>1986</year>
@@ -5269,25 +5277,25 @@
 	</software>
 
 	<software name="mrdo">
-		<description>Mr. Do</description>
+		<description>Mr. Do (clean crack)</description>
 		<year>1983</year>
 		<publisher>Datasoft</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="mrdo.dsk" size="143360" crc="b503e1b8" sha1="72b7c3c5b2da00bafbd43e658e3713fd132f7117" offset="0x0000" />
+				<rom name="mr. do (4am crack).dsk" size="143360" crc="a3e4f90f" sha1="ca54e92fcf4266061e782ad841867cec5eed347f" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="mspac">
-		<description>Ms. Pac Man</description>
+		<description>Ms. Pac Man (clean crack)</description>
 		<year>1983</year>
 		<publisher>Atari</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="mspacman.dsk" size="143360" crc="9e367d85" sha1="63648dce05d5aec358d0e038c5158614c1ae74c4" offset="0x0000" />
+				<rom name="ms. pac-man (atari)(4am crack).dsk" size="143360" crc="7b7196fc" sha1="49b21f8c3a838c12b2d785f4342432212698c0bb" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -5399,13 +5407,37 @@
 	</software>
 
 	<software name="pacman">
-		<description>Pac-Man</description>
+		<description>Pac-Man (clean crack)</description>
 		<year>1983</year>
 		<publisher>Atari</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="pacman.dsk" size="143360" crc="f35578be" sha1="5a907f53299bc40c46dab4d5956cd9e70911f515" offset="0x0000" />
+				<rom name="pac-man (atari)(4am crack).dsk" size="143360" crc="988e08f1" sha1="5eb20be8a79227715177b65cd0ea4a34be273629" offset="0x0000" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="pacmand">
+		<description>Pac-Man (clean crack)</description>
+		<year>1983</year>
+		<publisher>Datasoft / Namco America</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="pac-man (datasoft)(4am crack).dsk" size="143360" crc="9852a378" sha1="dd4cec96fd37aba85f5bd2a5b75d0656904765d1" offset="0x0000" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="pacmant">
+		<description>Pac-Man (clean crack)</description>
+		<year>1983</year>
+		<publisher>Thunder Mountain / Namco</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="pac-man (datasoft)(4am crack).dsk" size="143360" crc="82379bed" sha1="9b3e1b9e78dcfb1f8f55925c9bf2f6161423004d" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -5551,6 +5583,30 @@
 		</part>
 	</software>
 
+	<software name="racter">
+		<description>Racter (clean crack)</description>
+		<year>1985</year>
+		<publisher>Mindscape</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="racter (1985)(mindscape)(trex crack).dsk" size="143360" crc="4e8d06f8" sha1="43baa8c78fe606b526f575e191dd954548c70470" offset="0x0000" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rambo">
+		<description>Rambo First Blood Part II (clean crack)</description>
+		<year>1985</year>
+		<publisher>Mindscape / Angelsoft</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="rambo first blood part ii (1985)(mindscape - angelsoft)(trex crack).dsk" size="143360" crc="58606af1" sha1="82208a4baeadd03b00cb28cab503db266db4fbb2" offset="0x0000" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="rampage">
 		<description>Rampage</description>
 		<year>1988</year>
@@ -5564,8 +5620,8 @@
 	</software>
 
 	<software name="renegade">
-		<!-- ProDOS 8 based & hard drive compatable -->
 		<description>Renegade (clean crack)</description>
+		<!-- ProDOS 8 based & hard drive compatable -->
 		<year>1988</year>
 		<publisher>Taito America / NovaLogic</publisher>
 
@@ -6083,13 +6139,14 @@
 	</software>
 
 	<software name="tapper">
-		<description>Tapper</description>
+		<description>Tapper (clean crack)</description>
+		<!-- Corrected rerip 09/19/2016 -->
 		<year>1983</year>
 		<publisher>Bally/Midway</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
-				<rom name="tapper.dsk" size="143360" crc="e86b1b99" sha1="7af7c32e3b21c0aa69290d7535b26089fc865999" offset="0x0000" />
+				<rom name="tapper (4am crack).dsk" size="143360" crc="66c7cab7" sha1="20ad51af4623623c1204bb7d9c6612aafadaf882" offset="0x0000" />
 			</dataarea>
 		</part>
 	</software>
@@ -8384,6 +8441,19 @@
 		</part>
 	</software>
 
+	<software name="gumball">
+		<description>Gumball (clean crack)</description>
+		<!-- Corrected image 09/24/2016 -->
+		<year>1983</year>
+		<publisher>Broderbund</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="gumball (4am & san inc crack).dsk" size="143360" crc="56e68a48" sha1="6d0e3652cce177637f332a6df34d7fb133cad2c7" offset="0x0000" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="heredog">
 		<description>Heredity Dog (clean crack)</description>
 		<year>1983</year>
@@ -8549,6 +8619,23 @@
 		</part>
 	</software>
 
+	<software name="jumpman">
+		<description>Jumpman (clean crack)</description>
+		<year>1983</year>
+		<publisher>Epyx</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="jumpman (4am crack) side a.dsk" size="143360" crc="4f291aa3" sha1="1c43eac018c0a04e70177cf413d7b20b4eaa3a89" offset="0x0000" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="jumpman (4am crack) side b.dsk" size="143360" crc="90312d4c" sha1="0ba7c41afbb31c93e4dc602da12cf577876dbc2c" offset="0x0000" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="junghunt">
 		<description>Jungle Hunt (clean crack)</description>
 		<year>1984</year>