diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm
index 19db8a065f4..2e228225b15 100644
--- a/code/defines/procs/gamehelpers.dm
+++ b/code/defines/procs/gamehelpers.dm
@@ -188,6 +188,12 @@
 				if(C.occupant.client)
 					hear += C.occupant
 
+	for(var/obj/item/device/radio/theradio in V)
+		if(isInSight(source,theradio))
+			hear += theradio
+
+
+
 	return hear
 
 #define SIGN(X) ((X<0)?-1:1)
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 5f7079362d5..5a9ce5e6bd3 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -27,6 +27,8 @@ var/global/datum/controller/occupations/job_master
 			if(!job)	continue
 			if(job.faction != faction)	continue
 			occupations += job
+
+			occupations = shuffle(occupations) //Shuffles job-list at setup.
 		return 1
 
 
@@ -149,7 +151,6 @@ var/global/datum/controller/occupations/job_master
 		if(unassigned.len == 0)	return 0
 		//Shuffle players and jobs
 		unassigned = shuffle(unassigned)
-	//	occupations = shuffle(occupations) check and see if we can do this one
 
 		HandleFeedbackGathering()