diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index afa39cbdf3a..479e8edf240 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -458,7 +458,7 @@ What a mess.*/
 							temp = "<h5>Rank:</h5>"
 							temp += "<ul>"
 							for(var/rank in get_all_jobs())
-								temp += "<li><a href='?src=\ref[src];choice=Change Rank;rank=[rank]'>[rank]</a></li>"
+								temp += "<li><a href='?src=\ref[src];choice=Change Rank;rank=[rank];real_rank=[rank]'>[rank]</a></li>"
 							temp += "</ul>"
 						else
 							alert(usr, "You do not have the required rank to do this!")
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index d1e095b8f06..997ca128d7f 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -256,8 +256,8 @@ WELDINGTOOOL
 			user.eye_blind = 5
 			user.eye_blurry = 5
 			user.disabilities |= 1
-			spawn(100)
-				user.disabilities &= ~1
+//			spawn(100)
+//				user.disabilities &= ~1 //Simpler to just leave them short sighted.
 		return
 
 	attack(mob/M as mob, mob/user as mob)
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index a152c32e18c..c39941c8aaa 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -36,7 +36,7 @@
 				toxmob(A)
 			if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/machinery/singularity/)))
 				A:energy += energy
-				energy = 0
+//				energy = 0	//This breaks the current singularity
 			if( istype(A,/obj/machinery/rust/particle_catcher) )
 				var/obj/machinery/rust/particle_catcher/collided_catcher = A
 				if(particle_type && particle_type != "neutron")
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 9c98d192c99..668b969d3f2 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -1,7 +1,8 @@
 var/global/list/uneatable = list(
 	/turf/space,
 	/obj/effect/overlay,
-	/mob/aiEye
+	/mob/aiEye,
+	/mob/dead/observer // Stop ghosts being ate and not being able to get back to their bodies
 	)
 
 /obj/machinery/singularity/