diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 35f837e97fd..180007fa1b8 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -54,8 +54,8 @@
 #define INIT_ORDER_TRAITS 11
 #define INIT_ORDER_TICKER 10
 #define INIT_ORDER_MAPPING 9
-#define INIT_ORDER_ATOMS 8
-#define INIT_ORDER_NETWORKS 7
+#define INIT_ORDER_NETWORKS 8
+#define INIT_ORDER_ATOMS 7
 #define INIT_ORDER_LANGUAGE 6
 #define INIT_ORDER_MACHINES 5
 #define INIT_ORDER_CIRCUIT 4
@@ -79,30 +79,32 @@
 
 #define FIRE_PRIORITY_IDLE_NPC		10
 #define FIRE_PRIORITY_SERVER_MAINT	10
+#define FIRE_PRIORITY_RESEARCH		10
 #define FIRE_PRIORITY_GARBAGE		15
-#define FIRE_PRIORITY_RESEARCH		15
+#define FIRE_PRIORITY_WET_FLOORS	20
 #define FIRE_PRIORITY_AIR			20
 #define FIRE_PRIORITY_NPC			20
 #define FIRE_PRIORITY_PROCESS		25
 #define FIRE_PRIORITY_THROWING		25
-#define FIRE_PRIORITY_FLIGHTPACKS	30
 #define FIRE_PRIORITY_SPACEDRIFT	30
+#define FIRE_PRIORITY_FIELDS		30
 #define FIRE_PRIOTITY_SMOOTHING		35
 #define FIRE_PRIORITY_ORBIT			35
+#define FIRE_PRIORITY_NETWORKS		40
 #define FIRE_PRIORITY_OBJ			40
-#define FIRE_PRIORUTY_FIELDS		40
 #define FIRE_PRIORITY_ACID			40
 #define FIRE_PRIOTITY_BURNING		40
 #define FIRE_PRIORITY_INBOUNDS		40
 #define FIRE_PRIORITY_DEFAULT		50
 #define FIRE_PRIORITY_PARALLAX		65
-#define FIRE_PRIORITY_NETWORKS		80
+#define FIRE_PRIORITY_FLIGHTPACKS	80
 #define FIRE_PRIORITY_MOBS			100
 #define FIRE_PRIORITY_TGUI			110
 #define FIRE_PRIORITY_TICKER		200
 #define FIRE_PRIORITY_OVERLAYS		500
 #define FIRE_PRIORITY_INPUT			1000 // This must always always be the max highest priority. Player input must never be lost.
 
+
 // SS runlevels
 
 #define RUNLEVEL_INIT 0
diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm
index b3a47e3ce22..78303449f26 100644
--- a/code/controllers/failsafe.dm
+++ b/code/controllers/failsafe.dm
@@ -1,4 +1,4 @@
-var/global/datum/controller/failsafe/Failsafe
+GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
 
 
 /datum/controller/failsafe // This thing pretty much just keeps poking the master controller
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 8aa1f1b0873..28395717f08 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -405,7 +405,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 		if(SS_flags & SS_NO_FIRE)
 			subsystemstocheck -= SS
 			continue
-		if(!(SS_flags & SS_TICKER) && (SS_flags & SS_KEEP_TIMING) && SS.last_fire + (SS.wait * 0.75) > world.time)
+		if((SS_flags & (SS_TICKER|SS_KEEP_TIMING)) == SS_KEEP_TIMING && SS.last_fire + (SS.wait * 0.75) > world.time)
 			continue
 		SS.enqueue()
 	. = 1
diff --git a/code/modules/ext_scripts/python.dm b/code/modules/ext_scripts/python.dm
index 6781af866e3..1f761542a35 100644
--- a/code/modules/ext_scripts/python.dm
+++ b/code/modules/ext_scripts/python.dm
@@ -1,4 +1,5 @@
 /proc/ext_python(var/script, var/args, var/scriptsprefix = 1)
+	to_chat(world, "ext python [script] [args]")
 	if(scriptsprefix) script = "scripts/" + script
 
 	if(world.system_type == MS_WINDOWS)