diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index 3c88e278c10..c7c2a96aae9 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -29,7 +29,7 @@
 	. = ..()
 	if(distance <= 0)
 		. += "It's a tiny camera, microphone, and transmission device in a happy union."
-		. += "Needs to be both configured and brought in contact with monitor device to be fully functional."
+		. += "Needs to be both configured and brought in contact with monitor device to be fully functional. A pen can also be used to label the device on a given network."
 
 /obj/item/device/spy_bug/attack_self(mob/user)
 	radio.set_broadcasting(!radio.get_broadcasting())
@@ -44,11 +44,17 @@
 		var/obj/item/device/spy_monitor/SM = attacking_item
 		SM.pair(src, user)
 		return TRUE
+	if(attacking_item.ispen())
+		var/n_tag = sanitizeSafe( tgui_input_text(user, "What would you like to label the camera?", "Bug Labelling", default = camera.c_tag, max_length = MAX_NAME_LEN), MAX_NAME_LEN )
+		if(Adjacent(user) && user.stat == CONSCIOUS && n_tag)
+			camera.c_tag = n_tag
+			camera.name = "[camera.initial_name] - [n_tag]"
+			return TRUE
 	else
 		return ..()
 
 /obj/item/device/spy_bug/hear_talk(mob/M, var/msg, verb, datum/language/speaking)
-	radio.hear_talk(M, msg, speaking)
+	radio.hear_talk(M, msg, verb, speaking)
 
 
 /obj/item/device/spy_monitor
@@ -108,17 +114,17 @@
 	selected_camera = cameras[1]
 	view_camera(user)
 
-	operating = 1
+	operating = TRUE
 	while(selected_camera && Adjacent(user))
 		selected_camera = tgui_input_list(user, "Select camera bug to view.", "Spy Monitor", cameras)
 	selected_camera = null
-	operating = 0
+	operating = FALSE
 
 /obj/item/device/spy_monitor/proc/view_camera(mob/user)
 	spawn(0)
 		while(selected_camera && Adjacent(user))
 			var/turf/T = get_turf(selected_camera)
-			if(!T || !(T.z == user.z || !is_station_level(T.z) || !is_station_level(user.z)) || !selected_camera.can_use())
+			if(!T || !(T.z in GetConnectedZlevels(user.z)) || !selected_camera.can_use())
 				user.unset_machine()
 				user.reset_view(null)
 				to_chat(user, SPAN_NOTICE("[selected_camera] unavailable."))
@@ -149,14 +155,17 @@
 	// These cheap toys are accessible from the mercenary camera console as well
 	network = list(NETWORK_MERCENARY)
 	active_power_usage = 0
+	/// Set on Initialize(), simulates initial() but for the name variable so we can restore it when needed
+	var/initial_name
 
 /obj/machinery/camera/spy/Initialize()
 	. = ..()
 	name = "DV-136ZB #[rand(1000,9999)]"
+	initial_name = name
 	c_tag = name
 
 /obj/machinery/camera/spy/check_eye(var/mob/user as mob)
-	return 0
+	return FALSE
 
 /obj/item/device/radio/spy
 	canhear_range = 7
diff --git a/html/changelogs/Ben10083 - Fix Spy Bugs.yml b/html/changelogs/Ben10083 - Fix Spy Bugs.yml
new file mode 100644
index 00000000000..cc6df0d3611
--- /dev/null
+++ b/html/changelogs/Ben10083 - Fix Spy Bugs.yml	
@@ -0,0 +1,60 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Ben10083
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Spy bug microphones now properly handle different languages."
+  - bugfix: "Spy bug recognize connected z-levels, allowing use of bugs on offships and different horizon z-levels."
+  - qol: "Spy bugs can be labeled with pen to allow for an easier time switching between cameras."