diff --git a/hash/snes.xml b/hash/snes.xml
index 2889f9bc494..ba3b17fd3aa 100644
--- a/hash/snes.xml
+++ b/hash/snes.xml
@@ -2022,33 +2022,33 @@ List of non retail cartridges
 	</software>
 
 <!--
-   	<software name="pilotwinp" cloneof="pilotwin">
-		<!- - Van Halen - ->
-		<description>Pilotwings (Jpn, Prototype 19901025)</description>
-		<year>1990</year>
-		<publisher>Nintendo</publisher>
-		<part name="cart" interface="snes_cart">
-			<feature name="enhancement" value="DSP1" />
-			<feature name="pcb" value="SHVC-2Q0N-X1" />
-			<feature name="u1" value="U1 EPROM" />
-			<feature name="u2" value="U2 EPROM" /> <!- - emtpy slot - ->
-			<feature name="u3" value="U3" /> <!- - EPL16P8B - ->
-			<feature name="u4" value="U4 DRAM" /> <!- - emtpy slot - ->
-			<feature name="u5" value="U5" /> <!- - 2/10/2 FLY DSP (D77P25D) - ->
-			<feature name="u6" value="U6" /> <!- - 74HCU04 - ->
-			<feature name="u7" value="U7" /> <!- - CIC - ->
-			<feature name="cart_model" value="n/a" /> <!- - similar to SHVC-006 - ->
-			<feature name="cart_back_label" value="n/a" />
+    <software name="pilotwinp" cloneof="pilotwin">
+        <!- - Van Halen - ->
+        <description>Pilotwings (Jpn, Prototype 19901025)</description>
+        <year>1990</year>
+        <publisher>Nintendo</publisher>
+        <part name="cart" interface="snes_cart">
+            <feature name="enhancement" value="DSP1" />
+            <feature name="pcb" value="SHVC-2Q0N-X1" />
+            <feature name="u1" value="U1 EPROM" />
+            <feature name="u2" value="U2 EPROM" /> <!- - emtpy slot - ->
+            <feature name="u3" value="U3" /> <!- - EPL16P8B - ->
+            <feature name="u4" value="U4 DRAM" /> <!- - emtpy slot - ->
+            <feature name="u5" value="U5" /> <!- - 2/10/2 FLY DSP (D77P25D) - ->
+            <feature name="u6" value="U6" /> <!- - 74HCU04 - ->
+            <feature name="u7" value="U7" /> <!- - CIC - ->
+            <feature name="cart_model" value="n/a" /> <!- - similar to SHVC-006 - ->
+            <feature name="cart_back_label" value="n/a" />
 
-			<feature name="slot" value="lorom_dsp" />
-			<dataarea name="rom" size="524288">
-				<rom name="90-10-25 nes pw" size="524288" crc="" sha1="" offset="0x000000" />
-			</dataarea>
-			<dataarea name="addon" size="10240">
-				<rom name="dsp1.u5" size="10240" crc="2838f9f5" sha1="0a03ccb1fd2bea91151c745a4d1f217ae784f889" offset="0x000000" />
-			</dataarea>
-		</part>
-	</software>
+            <feature name="slot" value="lorom_dsp" />
+            <dataarea name="rom" size="524288">
+                <rom name="90-10-25 nes pw" size="524288" crc="" sha1="" offset="0x000000" />
+            </dataarea>
+            <dataarea name="addon" size="10240">
+                <rom name="dsp1.u5" size="10240" crc="2838f9f5" sha1="0a03ccb1fd2bea91151c745a4d1f217ae784f889" offset="0x000000" />
+            </dataarea>
+        </part>
+    </software>
 -->
 
 	<software name="piratedwup" cloneof="piratedw">
@@ -2735,7 +2735,7 @@ List of non retail cartridges
             <feature name="cart_model" value="n/a" /> <!- - similar to SHVC-006 - ->
             <feature name="cart_back_label" value="n/a" />
 
-			<feature name="slot" value="hirom_dsp" />
+            <feature name="slot" value="hirom_dsp" />
             <dataarea name="rom" size="524288">
                 <rom name="kart.u1" size="524288" crc="" sha1="" offset="0x000000" />
             </dataarea>
@@ -15791,7 +15791,7 @@ List of perfect retail cartridges rom dumps
 			<dataarea name="rom" size="524288">
 				<rom name="shvc-66-0.u1" size="524288" crc="052167cc" sha1="4b5725aeb7f770feadda6cfec5e609ff57fce363" offset="0x000000" />
 			</dataarea>
-			<dataarea name="nvram" size="131072">	<!-- The game expects 4x32kb of NVRAM to pass initial checks... Double check this! -->
+			<dataarea name="nvram" size="131072">   <!-- The game expects 4x32kb of NVRAM to pass initial checks... Double check this! -->
 			</dataarea>
 		</part>
 	</software>
@@ -42404,10 +42404,10 @@ List of unclassified roms
 		</part>
 	</software>
 
-	<software name="hanguk">
+	<software name="hanguk" cloneof="basload2">
 		<description>Hanguk Pro Yagu (Kor)</description>
 		<year>1994?</year>
-		<publisher>Jaleco?</publisher>
+		<publisher>Hyundai</publisher>
 		<sharedfeat name="compatibility" value="NTSC"/>
 		<part name="cart" interface="snes_cart">
 
@@ -57277,21 +57277,21 @@ List of unclassified roms
 
 <!-- removed for now since however interesting it may be, it is still homebrew material,
      keeping it here quoted in case we'd want to reintegrate it for some reason
-	<software name="starfox2a" cloneof="starfox2">
-		<description>Star Fox 2 (Jpn, Hack)</description>
-		<year>1995</year>
-		<publisher>&lt;homebrew&gt;</publisher>
-		<part name="cart" interface="snes_cart">
-			<feature name="enhancement" value="GSU-2" />
+    <software name="starfox2a" cloneof="starfox2">
+        <description>Star Fox 2 (Jpn, Hack)</description>
+        <year>1995</year>
+        <publisher>&lt;homebrew&gt;</publisher>
+        <part name="cart" interface="snes_cart">
+            <feature name="enhancement" value="GSU-2" />
 
-			<feature name="slot" value="lorom_sfx" />
-            		<dataarea name="rom" size="1048576">
-				<rom name="star fox 2 (japan) (proto) (alt 1).sfc" size="1048576" crc="79f3433d" sha1="aea7a00c52c0f4e102b98cd5fa6710e6282e0dee" offset="0x000000" />
-			</dataarea>
-			<dataarea name="nvram" size="65536">
-			</dataarea>
-		</part>
-	</software>
+            <feature name="slot" value="lorom_sfx" />
+                    <dataarea name="rom" size="1048576">
+                <rom name="star fox 2 (japan) (proto) (alt 1).sfc" size="1048576" crc="79f3433d" sha1="aea7a00c52c0f4e102b98cd5fa6710e6282e0dee" offset="0x000000" />
+            </dataarea>
+            <dataarea name="nvram" size="65536">
+            </dataarea>
+        </part>
+    </software>
 -->
 
 	<software name="starfox2">
diff --git a/hash/snes_bspack.xml b/hash/snes_bspack.xml
index d2ae41af442..d95ae52df86 100644
--- a/hash/snes_bspack.xml
+++ b/hash/snes_bspack.xml
@@ -2659,7 +2659,7 @@
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="bspack">
 
-			<feature name="slot" value="lorom" />
+			<feature name="slot" value="bsmempak" />
 			<dataarea name="rom" size="1048576">
 				<rom name="sonic blastman (bs).bs" size="1048576" crc="86bb53e5" sha1="e8411f5e0ea2b2922416710c9b463023fe1e5f39" offset="0x000000" />
 			</dataarea>
@@ -2672,7 +2672,7 @@
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="cart" interface="bspack">
 
-			<feature name="slot" value="hirom" />
+			<feature name="slot" value="bsmempak" />
 			<dataarea name="rom" size="1048576">
 				<rom name="table game daisyugo (bs).bs" size="1048576" crc="47e3047e" sha1="00ddbd9471f9b22b927a2361c672d7e4081fb69d" offset="0x000000" />
 			</dataarea>