diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 18873d8750b..5179e6cd6e4 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -110,13 +110,13 @@
 	if( istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(src,target) <= 1)
 		var/obj/o = target
 		o.reagents.trans_to(src, 50)
-		user << "\blue Extinguisher refilled"
+		user << "\blue \The [src] is now refilled"
 		playsound(src.loc, 'refill.ogg', 50, 1, -6)
 		return
 
 	if (!safety)
 		if (src.reagents.total_volume < 1)
-			usr << "\red the [src] is empty."
+			usr << "\red \The [src] is empty."
 			return
 
 		if (world.time < src.last_use + 20)
diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm
index a15845f0e6d..30415ed63cb 100644
--- a/code/modules/detectivework/detective_work.dm
+++ b/code/modules/detectivework/detective_work.dm
@@ -134,10 +134,8 @@ obj/machinery/computer/forensic_scanning
 					authenticated = 1
 					updateDialog()
 					return
-				var/obj/item/weapon/card/id/I = M.equipped()
-				if (I && istype(I))
-					if(src.check_access(I))
-						authenticated = 1
+				if(allowed(M))
+					authenticated = 1
 						//usr << "\green Access Granted"
 				//if(!authenticated)
 					//usr << "\red Access Denied"
@@ -289,7 +287,7 @@ obj/machinery/computer/forensic_scanning
 					if(fibers && fibers.len)
 						temp += "&nbsp<b>Fibers:</b><br>"
 						for(var/j = 1, j <= fibers.len, j++)
-							temp += "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]<br>"
 					var/list/blood = outputs[2]
 					if(blood && blood.len)
 						temp += "&nbsp<b>Blood:</b><br>"
@@ -312,7 +310,7 @@ obj/machinery/computer/forensic_scanning
 					if(fibers && fibers.len)
 						P.info += "&nbsp<b>Fibers:</b><br>"
 						for(var/j = 1, j <= fibers.len, j++)
-							P.info += "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]<br>"
 					var/list/blood = outputs[2]
 					if(blood && blood.len)
 						P.info += "&nbsp<b>Blood:</b><br>"