diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 3a04c69eb6f5..716a0ea6b50d 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -8,7 +8,7 @@
 	circuit = /obj/item/circuitboard/computer/secure_data
 	var/obj/item/card/id/scan = null
 	var/obj/item/device/clue_scanner/scanner = null
-	var/printing = null
+	var/printing = FALSE
 
 /obj/structure/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob)
 
@@ -355,12 +355,11 @@
 				if (!scanner || !scanner.print_list)
 					to_chat(user, SPAN_WARNING("No scanner data found."))
 					return
-
-				sleep(50)
+				to_chat(user, SPAN_NOTICE("Printing report."))
+				sleep(15)
 				playsound(loc, 'sound/machines/twobeep.ogg', 15, 1)
 
-				var/obj/item/paper/fingerprint/P = new /obj/item/paper/fingerprint(src, scanner.print_list)
-				P.forceMove(loc)
+				var/obj/item/paper/fingerprint/P = new /obj/item/paper/fingerprint(loc, scanner.print_list)
 				var/refkey = ""
 				for(var/obj/effect/decal/prints/print in scanner.print_list)
 					refkey += print.criminal_name
@@ -372,6 +371,7 @@
 				to_chat(user, SPAN_WARNING("No scanner found."))
 				return
 
+			QDEL_NULL_LIST(scanner.print_list)
 			scanner.update_icon()
 			to_chat(user, SPAN_NOTICE("Fingerprints cleared from the scanner."))
 
@@ -381,7 +381,7 @@
 				return
 
 			scanner.update_icon()
-			scanner.forceMove(get_turf(user))
+			scanner.forceMove(get_turf(src))
 			scanner = null
 		if ("print_personal_record")
 			var/id = params["id"]
@@ -397,14 +397,13 @@
 				if (!general_record)
 					to_chat(user, SPAN_WARNING("Record not found."))
 					return
-
+				to_chat(user, SPAN_NOTICE("Printing record."))
+				sleep(15)
 				playsound(loc, 'sound/machines/print.ogg', 15, 1)
-				sleep(50)
 
-				var/obj/item/paper/personalrecord/P = new /obj/item/paper/personalrecord(user, general_record, security_record)
-				P.forceMove(loc)
+				var/obj/item/paper/personalrecord/P = new /obj/item/paper/personalrecord(loc, general_record, security_record)
 				P.name = text("Security Record ([])", general_record.fields["name"])
-				printing = null
+				printing = FALSE
 		if ("update_photo")
 			var/id = params["id"]
 			var/photo_profile = params["photo_profile"]