diff --git a/code/WorkInProgress/virus2/diseasesplicer.dm b/code/WorkInProgress/virus2/diseasesplicer.dm
index 624f725f09..8b8777503c 100644
--- a/code/WorkInProgress/virus2/diseasesplicer.dm
+++ b/code/WorkInProgress/virus2/diseasesplicer.dm
@@ -68,14 +68,14 @@
 	user.machine = src
 	var/dat
 	if(splicing)
-		dat = "Splicing in progress"
+		dat = "Splicing in progress."
 	else if(scanning)
-		dat = "Splicing in progress"
+		dat = "Splicing in progress."
 	else if(burning)
-		dat = "Data disk burning in progress"
+		dat = "Data disk burning in progress."
 	else
 		if(dish)
-			dat = "Virus dish inserted"
+			dat = "Virus dish inserted."
 
 		dat += "<BR>Current DNA strand : "
 		if(memorybank)
@@ -88,7 +88,7 @@
 
 			dat += "<BR><A href='?src=\ref[src];disk=1'>Burn DNA Sequence to data storage disk</a>"
 		else
-			dat += "Empty"
+			dat += "Empty."
 
 		dat += "<BR><BR>"
 
@@ -101,13 +101,13 @@
 							dat += ": [e.effect.name]"
 						dat += " (5-[e.effect.stage])</a>"
 				else
-					dat += "<BR>Insufficent cells to attempt gene splicing"
+					dat += "<BR>Insufficent cells to attempt gene splicing."
 			else
-				dat += "<BR>No virus found in dish"
+				dat += "<BR>No virus found in dish."
 
 			dat += "<BR><BR><A href='?src=\ref[src];eject=1'>Eject disk</a>"
 		else
-			dat += "<BR>Please insert dish"
+			dat += "<BR>Please insert dish."
 
 	user << browse(dat, "window=computer;size=400x500")
 	onclose(user, "computer")
diff --git a/code/game/objects/secstorage/secstorage.dm b/code/game/objects/secstorage/secstorage.dm
index 9c6f5e324c..5a9defccdc 100644
--- a/code/game/objects/secstorage/secstorage.dm
+++ b/code/game/objects/secstorage/secstorage.dm
@@ -74,7 +74,6 @@
 		if (cx > mx)
 			cx = tx
 			cy--
-		//Foreach goto(56)
 	src.closer.screen_loc = text("[],[]", mx, my)
 	return
 
diff --git a/code/game/objects/storage/coat.dm b/code/game/objects/storage/coat.dm
index 208e62d004..b905b54f13 100644
--- a/code/game/objects/storage/coat.dm
+++ b/code/game/objects/storage/coat.dm
@@ -19,16 +19,15 @@
 	src.closer.screen_loc = "9,7"
 
 /obj/item/clothing/suit/storage/proc/view_inv(mob/user as mob)
-	if(!user)
+	if(!user.client)
 		return
 	user.client.screen += src.boxes
 	user.client.screen += src.closer
 	user.client.screen += src.contents
 
 /obj/item/clothing/suit/storage/proc/close(mob/user as mob)
-	if(!user)
+	if(!user.client)
 		return
-	user.s_active = src
 	user.client.screen -= src.boxes
 	user.client.screen -= src.closer
 	user.client.screen -= src.contents