diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index f73bd19f824..5d1b14e9623 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -34,6 +34,8 @@
 	if(stat & (NOPOWER|BROKEN)) 
 		return	
 		
+		
+	add_fingerprint(user)	
 	interact(user)
 
 
diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm
index 8a27eae5531..621044a24e7 100644
--- a/code/modules/shuttles/shuttle_console.dm
+++ b/code/modules/shuttles/shuttle_console.dm
@@ -12,7 +12,7 @@
 /obj/machinery/computer/shuttle_control/attack_hand(user as mob)
 	if(..(user))
 		return
-	//src.add_fingerprint(user)	//shouldn't need fingerprints just for looking at it.
+
 	if(!allowed(user))
 		user << "\red Access Denied."
 		return 1
diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm
index 4350591c548..f8b0dfcd85f 100644
--- a/code/modules/shuttles/shuttle_emergency.dm
+++ b/code/modules/shuttles/shuttle_emergency.dm
@@ -64,7 +64,7 @@
 	if (!can_launch(user)) return
 
 	if(emergency_shuttle.no_escape)
-		user << "<span class='warning'>The emergency shuttle has been disabled by Centcom.</span>"
+		user << "<span class='warning'>The emergency shuttle has been disabled by Central Command.</span>"
 		return
 
 	if (istype(user, /obj/machinery/computer/shuttle_control/emergency))	//if we were given a command by an emergency shuttle console
@@ -146,7 +146,7 @@
 	src.visible_message("[src] beeps as it scans [ident].")
 	authorized[dna_hash] = auth_name
 	if (req_authorizations - authorized.len)
-		world << "\blue <B>Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot.</B>"
+		world << "<span class='notice'>Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot.</span>"
 	return 1
 
 
@@ -158,7 +158,7 @@
 
 /obj/machinery/computer/shuttle_control/emergency/emag_act(user as mob)
 	if (!emagged)
-		user << "\blue You short out the [src]'s authorization protocols."
+		user << "<span class='notice'>You short out the [src]'s authorization protocols.</span>"
 		emagged = 1
 		return
 
diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm
index 5a2afe30182..1b947f627ad 100644
--- a/code/modules/shuttles/shuttle_specops.dm
+++ b/code/modules/shuttles/shuttle_specops.dm
@@ -77,12 +77,12 @@
 	if (location)	//just arrived home
 		for(var/turf/T in get_area_turfs(destination))
 			var/mob/M = locate(/mob) in T
-			M << "\red You have arrived at Central Command. Operation has ended!"
+			M << "<span class='warning'>You have arrived at Central Command. Operation has ended!</span>"
 	else	//just left for the station
 		launch_mauraders()
 		for(var/turf/T in get_area_turfs(destination))
 			var/mob/M = locate(/mob) in T
-			M << "\red You have arrived at [station_name]. Commence operation!"
+			M << "<span class='warning'>You have arrived at [station_name]. Commence operation!</span>"
 
 	reset_time = world.time + specops_return_delay	//set the timeout
 
@@ -94,7 +94,7 @@
 	radio_announce("ALERT: LAUNCH SEQUENCE ABORTED")
 	if (istype(in_use, /obj/machinery/computer))
 		var/obj/machinery/computer/C = in_use
-		C.visible_message("\red Launch sequence aborted.")
+		C.visible_message("<span class='warning'>Launch sequence aborted.</span>")
 
 	..()
 
diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm
index a33f067c8ec..517b91c03ec 100644
--- a/code/modules/shuttles/shuttle_supply.dm
+++ b/code/modules/shuttles/shuttle_supply.dm
@@ -1,8 +1,3 @@
-
-
-
-
-
 /datum/shuttle/ferry/supply
 	var/away_location = 1	//the location to hide at while pretending to be in-transit
 	var/late_chance = 80
diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm
index b3da5fdf98e..d66f2e4ae80 100644
--- a/code/modules/shuttles/shuttles_multi.dm
+++ b/code/modules/shuttles/shuttles_multi.dm
@@ -78,7 +78,7 @@
 
 /obj/machinery/computer/shuttle_control/multi/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
diff --git a/code/modules/shuttles/whiteship.dm b/code/modules/shuttles/whiteship.dm
index 938f2926869..e0d485afb11 100644
--- a/code/modules/shuttles/whiteship.dm
+++ b/code/modules/shuttles/whiteship.dm
@@ -12,7 +12,7 @@
 /obj/machinery/computer/shuttle_control/multi/whiteship/New()
 	var/area/A = get_area(src)
 	if(!istype(A,/area/shuttle/derelict/ship))
-		visible_message("<span class='warning'>\The [src] displays a message: No connectable systems located. Shutting down.</span>")
+		visible_message("<span class='warning'>\The [src] displays a message: No connectible systems located. Shutting down.</span>")
 		var/V = text2path(circuit)
 		new V(loc)