diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm
index 1c4c642e696..3e678ed9fa9 100644
--- a/code/game/objects/devices/PDA/uplink.dm
+++ b/code/game/objects/devices/PDA/uplink.dm
@@ -56,7 +56,7 @@
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=botchat'>Binary Translator</A> (3)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=lawmod'>Hacked AI Module</A> (7)<BR>"
 	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=singubeacon'>Singularity Beacon</A> (does not include a screwdriver) (8)<BR>"
+	menu_message += "<A href='byond://?src=\ref[src];buy_item=singubeacon'>Singularity Beacon</A> (does not include a screwdriver) (3)<BR>"
 	menu_message += "<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=toolbox'>Syndicate Toolbox</A> (Includes various tools) (1)<BR>"
 
@@ -167,8 +167,8 @@
 					uses -= 3
 					new /obj/item/device/radio/headset/traitor(get_turf(hostpda))
 			if("singubeacon")
-				if(uses >= 8)
-					uses -= 8
+				if(uses >= 3)
+					uses -= 3
 					new /obj/machinery/singularity_beacon/syndicate(get_turf(hostpda))
 
 			if("toolbox")
diff --git a/code/game/objects/storage/toolbox.dm b/code/game/objects/storage/toolbox.dm
index 0f423a33003..62a17ab8cb0 100644
--- a/code/game/objects/storage/toolbox.dm
+++ b/code/game/objects/storage/toolbox.dm
@@ -37,6 +37,7 @@
 
 /obj/item/weapon/storage/toolbox/syndicate/New()
 	..()
+	var/color = pick("red","yellow","green","blue")
 	new /obj/item/weapon/screwdriver(src)
 	new /obj/item/weapon/wrench(src)
 	new /obj/item/weapon/weldingtool(src)
diff --git a/code/game/spacecraft/syndicatebeacon.dm b/code/game/spacecraft/syndicatebeacon.dm
index 479bc6dc4c5..d25fa0f7681 100644
--- a/code/game/spacecraft/syndicatebeacon.dm
+++ b/code/game/spacecraft/syndicatebeacon.dm
@@ -109,6 +109,8 @@
 	anchored = 0
 	density = 1
 
+	layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS
+
 	stat = 0
 
 	var/active = 0 //It doesn't use up power, so use_power wouldn't really suit it
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 85f37b3bdc3..adf576c4e77 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -259,9 +259,9 @@ var/global/list/uneatable = list(
 		move(var/movement_dir = 0)
 			if(!move_self)
 				return 0
-			if(!(movement_dir in cardinal))
+			if(!target && !(movement_dir in cardinal))
 				movement_dir = pick(NORTH, SOUTH, EAST, WEST)
-			if(target)
+			else if(target)
 				movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one
 			if(current_size >= 9)//The superlarge one does not care about things in its way
 				spawn(0)