diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index ad296e20065..894f9f9535a 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -122,7 +122,7 @@
 						for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order))
 							var/crimstat = ""
 							for(var/datum/data/record/E in data_core.security)
-								if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
+								if ((E.fields["name"] == R.fields["name"]) && (E.fields["id"] == R.fields["id"]))
 									crimstat = E.fields["criminal"]
 							var/background
 							switch(crimstat)
@@ -415,6 +415,7 @@ What a mess.*/
 			if ("Purge All Records")
 				for(var/datum/data/record/R in data_core.security)
 					del(R)
+				data_core.security.Cut()
 				temp = "All Security records deleted."
 
 			if ("Add Entry")
@@ -460,6 +461,7 @@ What a mess.*/
 					screen = 3
 
 			if ("New Record (General)")
+				//General Record
 				var/datum/data/record/G = new /datum/data/record()
 				G.fields["name"] = "New Record"
 				G.fields["id"] = "[num2hex(rand(1, 1.6777215E7), 6)]"
@@ -472,6 +474,7 @@ What a mess.*/
 				data_core.general += G
 				active1 = G
 
+				//Security Record
 				var/datum/data/record/R = new /datum/data/record()
 				R.fields["name"] = active1.fields["name"]
 				R.fields["id"] = active1.fields["id"]
@@ -483,7 +486,7 @@ What a mess.*/
 				data_core.security += R
 				active2 = R
 
-						//Medical Record
+				//Medical Record
 				var/datum/data/record/M = new /datum/data/record()
 				M.fields["id"]			= active1.fields["id"]
 				M.fields["name"]		= active1.fields["name"]
@@ -506,13 +509,17 @@ What a mess.*/
 			if ("Edit Field")
 				var/a1 = active1
 				var/a2 = active2
+
 				switch(href_list["field"])
 					if("name")
-						if (istype(active1, /datum/data/record))
+						if (istype(active1, /datum/data/record) || istype(active2, /datum/data/record))
 							var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null)  as text
 							if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
 								return
-							active1.fields["name"] = t1
+							if(istype(active1, /datum/data/record))
+								active1.fields["name"] = t1
+							if(istype(active2, /datum/data/record))
+								active2.fields["name"] = t1
 					if("id")
 						if(istype(active2,/datum/data/record) || istype(active1,/datum/data/record))
 							var/t1 = copytext(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null)  as text),1,MAX_MESSAGE_LEN)
@@ -621,16 +628,21 @@ What a mess.*/
 
 					if ("Delete Record (Security) Execute")
 						if (active2)
+							data_core.security -= active2
 							del(active2)
 
 					if ("Delete Record (ALL) Execute")
 						if (active1)
 							for(var/datum/data/record/R in data_core.medical)
 								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
+									data_core.medical -= R
 									del(R)
-								else
+									break
+							data_core.general -= active1
 							del(active1)
+
 						if (active2)
+							data_core.security -= active2
 							del(active2)
 					else
 						temp = "This function does not appear to be working at the moment. Our apologies."
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 0a642258374..62c86d3a5ad 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -245,7 +245,7 @@
 	name = "bananium airlock"
 	desc = "Honkhonkhonk"
 	icon = 'icons/obj/doors/Doorbananium.dmi'
-	var/mineral = "clown"
+	var/mineral = "bananium"
 	doortype = /obj/structure/door_assembly/door_assembly_clown
 
 /obj/machinery/door/airlock/sandstone
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 155d4cab07f..06cb67f69d9 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -267,7 +267,7 @@ obj/structure/door_assembly/New()
 	anchored = 1
 	density = 1
 	state = 1
-	mineral = "clown"
+	mineral = "bananium"
 
 /obj/structure/door_assembly/door_assembly_sandstone
 	name = "sandstone airlock assembly"
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index bb0dc4486f6..0d0b1201ce9 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -7,6 +7,7 @@
 	anchored = 1
 	icon = 'icons/turf/walls.dmi'
 	var/mineral = "metal"
+	var/walltype = "metal"
 	var/opening = 0
 	density = 1
 	opacity = 1
@@ -31,20 +32,20 @@
 /obj/structure/falsewall/relativewall()
 
 	if(!density)
-		icon_state = "[mineral]fwall_open"
+		icon_state = "[walltype]fwall_open"
 		return
 
 	var/junction = 0 //will be used to determine from which side the wall is connected to other walls
 
 	for(var/turf/simulated/wall/W in orange(src,1))
 		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
-			if(src.mineral == W.mineral)//Only 'like' walls connect -Sieve
+			if(walltype == W.walltype)//Only 'like' walls connect -Sieve
 				junction |= get_dir(src,W)
 	for(var/obj/structure/falsewall/W in orange(src,1))
 		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
-			if(src.mineral == W.mineral)
+			if(walltype == W.walltype)
 				junction |= get_dir(src,W)
-	icon_state = "[mineral][junction]"
+	icon_state = "[walltype][junction]"
 	return
 
 /obj/structure/falsewall/attack_hand(mob/user)
@@ -72,24 +73,24 @@
 
 /obj/structure/falsewall/proc/do_the_flick()
 	if(density)
-		flick("[mineral]fwall_opening", src)
+		flick("[walltype]fwall_opening", src)
 	else
-		flick("[mineral]fwall_closing", src)
+		flick("[walltype]fwall_closing", src)
 
 /obj/structure/falsewall/update_icon(relativewall = 1)//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
 	if(density)
-		icon_state = "[mineral]0"
+		icon_state = "[walltype]0"
 		if(relativewall)
 			relativewall()
 	else
-		icon_state = "[mineral]fwall_open"
+		icon_state = "[walltype]fwall_open"
 
 /obj/structure/falsewall/proc/ChangeToWall(delete = 1)
 	var/turf/T = get_turf(src)
-	if(!mineral || mineral == "metal")
+	if(!walltype || walltype == "metal")
 		T.ChangeTurf(/turf/simulated/wall)
 	else
-		T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
+		T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[walltype]"))
 	if(delete)
 		qdel(src)
 	return T
@@ -176,11 +177,11 @@
 
 	for(var/turf/simulated/wall/W in orange(src,1))
 		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
-			if(src.mineral == W.mineral)//Only 'like' walls connect -Sieve
+			if(src.walltype == W.walltype)//Only 'like' walls connect -Sieve
 				junction |= get_dir(src,W)
 	for(var/obj/structure/falsewall/W in orange(src,1))
 		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
-			if(src.mineral == W.mineral)
+			if(src.walltype == W.walltype)
 				junction |= get_dir(src,W)
 	icon_state = "rwall[junction]"
 	return
@@ -194,6 +195,7 @@
 	desc = "A wall with uranium plating. This is probably a bad idea."
 	icon_state = ""
 	mineral = "uranium"
+	walltype = "uranium"
 	var/active = null
 	var/last_event = 0
 
@@ -226,24 +228,28 @@
 	desc = "A wall with gold plating. Swag!"
 	icon_state = ""
 	mineral = "gold"
+	walltype = "gold"
 
 /obj/structure/falsewall/silver
 	name = "silver wall"
 	desc = "A wall with silver plating. Shiny."
 	icon_state = ""
 	mineral = "silver"
+	walltype = "silver"
 
 /obj/structure/falsewall/diamond
 	name = "diamond wall"
 	desc = "A wall with diamond plating. You monster."
 	icon_state = ""
 	mineral = "diamond"
+	walltype = "diamond"
 
 /obj/structure/falsewall/plasma
 	name = "plasma wall"
 	desc = "A wall with plasma plating. This is definately a bad idea."
 	icon_state = ""
 	mineral = "plasma"
+	walltype = "plasma"
 
 /obj/structure/falsewall/plasma/attackby(obj/item/weapon/W, mob/user)
 	if(is_hot(W) > 300)
@@ -268,17 +274,20 @@
 	name = "bananium wall"
 	desc = "A wall with bananium plating. Honk!"
 	icon_state = ""
-	mineral = "clown"
+	mineral = "bananium"
+	walltype = "clown"
 
 /obj/structure/falsewall/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating."
 	icon_state = ""
 	mineral = "sandstone"
+	walltype = "sandstone"
 //------------wtf?------------end
 
 /obj/structure/falsewall/wood
 	name = "wooden wall"
 	desc = "A wall with wooden plating."
 	icon_state = ""
-	mineral = "wood"
\ No newline at end of file
+	mineral = "wood"
+	walltype = "wood"
\ No newline at end of file
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index bf542a54c9c..f5a22006542 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -236,7 +236,7 @@
 
 /obj/structure/statue/bananium
 	hardness = 3
-	mineralType = "clown"
+	mineralType = "bananium"
 	desc = "A bananium statue with a small engraving:'HOOOOOOONK'."
 
 /obj/structure/statue/bananium/clown
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index f3a0848ef4f..a5e00d5b6dc 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -35,7 +35,7 @@
 	desc = "A wall with bananium plating. Honk!"
 	icon_state = "clown0"
 	walltype = "clown"
-	mineral = "clown"
+	mineral = "bananium"
 
 /turf/simulated/wall/mineral/sandstone
 	name = "sandstone wall"
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 82ec0a9e4fa..c39d03f38ac 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -99,7 +99,7 @@
 					new/turf/simulated/floor/plating/asteroid/airless/cave(src)
 				if("Gibtonite")
 					M = new/turf/simulated/mineral/gibtonite(src)
-				if("Clown")
+				if("Bananium")
 					M = new/turf/simulated/mineral/clown(src)
 				/*if("Adamantine")
 					M = new/turf/simulated/mineral/adamantine(src)*/
@@ -178,7 +178,7 @@
 /turf/simulated/mineral/clown
 	name = "bananium deposit"
 	icon_state = "rock_Clown"
-	mineralName = "Clown"
+	mineralName = "Bananium"
 	mineralAmt = 3
 	spreadChance = 0
 	spread = 0
@@ -416,7 +416,7 @@
 				new /obj/item/weapon/ore/plasma(src)
 			if (src.mineralName == "Diamond")
 				new /obj/item/weapon/ore/diamond(src)
-			if (src.mineralName == "Clown")
+			if (src.mineralName == "Bananium")
 				new /obj/item/weapon/ore/bananium(src)
 	var/turf/simulated/floor/plating/asteroid/airless/N = ChangeTurf(/turf/simulated/floor/plating/asteroid/airless)
 	N.fullUpdateMineralOverlays()