diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 7c964b9d4b..31d99ebb05 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -252,8 +252,9 @@
 	for(var/iy = 0,iy < 5, iy++)
 		for(var/ix = 0, ix < 5, ix++)
 			mine_turf = locate(tx + ix, ty + iy, T.z)
-			if(mine_turf && mine_turf.has_resources)
-				resource_field += mine_turf
+			if(!istype(mine_turf, /turf/space/))
+				if(mine_turf && mine_turf.has_resources)
+					resource_field += mine_turf
 
 	if(!resource_field.len)
 		system_error("resources depleted")
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 0a5c2d94c3..b9fc47e4e9 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -35,7 +35,7 @@ var/list/mining_overlay_cache = list()
 	var/ignore_mapgen
 
 	var/ore_types = list(
-		"iron" = /obj/item/weapon/ore/iron,
+		"hematite" = /obj/item/weapon/ore/iron,
 		"uranium" = /obj/item/weapon/ore/uranium,
 		"gold" = /obj/item/weapon/ore/gold,
 		"silver" = /obj/item/weapon/ore/silver,
@@ -44,7 +44,7 @@ var/list/mining_overlay_cache = list()
 		"osmium" = /obj/item/weapon/ore/osmium,
 		"hydrogen" = /obj/item/weapon/ore/hydrogen,
 		"silicates" = /obj/item/weapon/ore/glass,
-		"carbonaceous rock" = /obj/item/weapon/ore/coal
+		"carbon" = /obj/item/weapon/ore/coal
 	)
 
 	has_resources = 1
@@ -483,6 +483,11 @@ var/list/mining_overlay_cache = list()
 				if(prob(50))
 					M.Stun(5)
 			M.apply_effect(25, IRRADIATE)
+			if(prob(25))
+				excavate_find(prob(5), finds[1])
+	else if(rand(1,500) == 1)
+		visible_message("<span class='notice'>An old dusty crate was buried within!</span>")
+		new /obj/structure/closet/crate/secure/loot(src)
 
 	make_floor()
 	update_icon(1)
@@ -546,10 +551,10 @@ var/list/mining_overlay_cache = list()
 
 	var/mineral_name
 	if(rare_ore)
-		mineral_name = pickweight(list("uranium" = 10, "platinum" = 10, "iron" = 20, "coal" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20))
+		mineral_name = pickweight(list("uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20))
 
 	else
-		mineral_name = pickweight(list("uranium" = 5, "platinum" = 5, "iron" = 35, "coal" = 35, "diamond" = 1, "gold" = 5, "silver" = 5, "phoron" = 10))
+		mineral_name = pickweight(list("uranium" = 5, "platinum" = 5, "hematite" = 35, "carbon" = 35, "diamond" = 1, "gold" = 5, "silver" = 5, "phoron" = 10))
 
 	if(mineral_name && (mineral_name in ore_data))
 		mineral = ore_data[mineral_name]
diff --git a/html/changelogs/Anewbe - MiningFixes.yml b/html/changelogs/Anewbe - MiningFixes.yml
new file mode 100644
index 0000000000..dbe16dbd44
--- /dev/null
+++ b/html/changelogs/Anewbe - MiningFixes.yml	
@@ -0,0 +1,39 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Anewbe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Carbon and Hematite should show up in asteroid walls."
+  - rscadd: "Readded the random crates from mining."
+  - rscadd: "Digging through an artifact sometimes doesn't destroy the artifact."
+  - bugfix: "Space and cracked sand should no longer stop mining drills."
\ No newline at end of file
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index 4c77191d26..30f8cdde7c 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ