diff --git a/code/game/turfs/open/floor/plating/catwalk_plating.dm b/code/game/turfs/open/floor/plating/catwalk_plating.dm
index 8f5ff3a1fa92..c6a1bdc62138 100644
--- a/code/game/turfs/open/floor/plating/catwalk_plating.dm
+++ b/code/game/turfs/open/floor/plating/catwalk_plating.dm
@@ -13,7 +13,6 @@
 	baseturfs = /turf/open/floor/plating
 	floor_tile = /obj/item/stack/tile/catwalk_tile
 	layer = CATWALK_LAYER
-	plane = FLOOR_PLANE
 	footstep = FOOTSTEP_CATWALK
 	overfloor_placed = TRUE
 	underfloor_accessibility = UNDERFLOOR_VISIBLE
@@ -27,7 +26,7 @@
 		var/mutable_appearance/plating_underlay = mutable_appearance(icon, "[catwalk_type]_below", TURF_LAYER)
 		catwalk_underlays[catwalk_type] = plating_underlay
 	underlays += catwalk_underlays[catwalk_type]
-	update_icon()
+	update_appearance()
 
 /turf/open/floor/catwalk_floor/examine(mob/user)
 	. = ..()
@@ -44,16 +43,16 @@
 	if(!covered)
 		underfloor_accessibility = UNDERFLOOR_INTERACTABLE
 		layer = TURF_LAYER
-		plane = FLOOR_PLANE
 		icon_state = "[catwalk_type]_below"
 	else
 		underfloor_accessibility = UNDERFLOOR_VISIBLE
 		layer = CATWALK_LAYER
-		plane = FLOOR_PLANE //for some reason these are black
 		icon_state = "[catwalk_type]_above"
+
+	levelupdate()
 	user.balloon_alert(user, "[!covered ? "cover removed" : "cover added"]")
 	tool.play_tool_sound(src)
-	update_icon()
+	update_appearance()
 
 /turf/open/floor/catwalk_floor/crowbar_act(mob/user, obj/item/crowbar)
 	if(covered)
diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm
index 3f8e1a458662..b9369ead0b88 100644
--- a/code/modules/antagonists/abductor/machinery/camera.dm
+++ b/code/modules/antagonists/abductor/machinery/camera.dm
@@ -22,7 +22,7 @@
 	eyeobj.visible_icon = TRUE
 	eyeobj.icon = 'icons/mob/cameramob.dmi'
 	eyeobj.icon_state = "abductor_camera"
-	eyeobj.invisibility = INVISIBILITY_OBSERVER
+	eyeobj.SetInvisibility(INVISIBILITY_OBSERVER)
 
 /obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user)
 	..()
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 63cf55779af0..62b353c94130 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -345,8 +345,6 @@ GLOBAL_LIST_EMPTY(pipeimages)
 		add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY)
 		pipe_color = obj_color
 	set_piping_layer(set_layer)
-	//var/turf/T = get_turf(src)
-	AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
 	atmos_init()
 	var/list/nodes = pipeline_expansion()
 	for(var/obj/machinery/atmospherics/A in nodes)
diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm
index 46f4850e0a7a..5cf6aaee1eeb 100644
--- a/code/modules/mining/aux_base_camera.dm
+++ b/code/modules/mining/aux_base_camera.dm
@@ -79,6 +79,7 @@
 		return FALSE
 	eyeobj = new /mob/camera/ai_eye/remote/base_construction(get_turf(spawn_spot))
 	eyeobj.origin = src
+	return TRUE
 
 
 /obj/machinery/computer/camera_advanced/base_construction/attackby(obj/item/W, mob/user, params)
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index f7fade0fc34e..5b8cac913709 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -25,6 +25,11 @@
 	update_appearance()
 	update_ai_detect_hud()
 	setLoc(loc, TRUE)
+	
+	//Yog: make all remote camera eyes visible to ghosts
+	//"It's probably fine." 
+	//-Cowbot93
+	SetInvisibility(INVISIBILITY_OBSERVER)
 
 /mob/camera/ai_eye/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
 	. = ..()
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 877da55cc1b7..972f2209c20e 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -12,10 +12,17 @@
 
 /mob/camera/ai_eye/remote/xenobio/setLoc(turf/destination, force_update = FALSE)
 	var/area/new_area = get_area(destination)
+	
 	if(new_area && new_area.name == allowed_area || new_area && new_area.xenobiology_compatible)
 		return ..()
-	else
+
+/mob/camera/ai_eye/remote/xenobio/can_z_move(direction, turf/start, turf/destination, z_move_flags = NONE, mob/living/rider)
+	. = ..()
+	if(!.)
 		return
+	var/area/new_area = get_area(.)
+	if(new_area.name != allowed_area && !new_area.xenobiology_compatible)
+		return FALSE
 
 /obj/machinery/computer/camera_advanced/xenobio
 	name = "Slime management console"
@@ -67,6 +74,7 @@
 	return ..()
 
 /obj/machinery/computer/camera_advanced/xenobio/CreateEye()
+	. = ..()
 	eyeobj = new /mob/camera/ai_eye/remote/xenobio(get_turf(src))
 	eyeobj.origin = src
 	eyeobj.visible_icon = TRUE
diff --git a/icons/mob/cameramob.dmi b/icons/mob/cameramob.dmi
index 7ecaf0f6d968..664b51d4521f 100644
Binary files a/icons/mob/cameramob.dmi and b/icons/mob/cameramob.dmi differ