diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm
index a0ce6e749a..3e7a68ef57 100644
--- a/code/game/objects/items/circuitboards/circuitboard.dm
+++ b/code/game/objects/items/circuitboards/circuitboard.dm
@@ -70,6 +70,7 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
 		return
 
 	. = ..()
+	moveToNullspace() // thorw ourselves in nullspace
 
 	for(var/comp_path in req_components)
 		var/comp_amt = req_components[comp_path]
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index 5bd1f67bee..746b25facb 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -27,7 +27,7 @@
 	toggle_internals(user)
 
 /obj/item/tank/proc/toggle_internals(mob/user)
-	var/mob/living/carbon/human/H = user
+	var/mob/living/carbon/H = user
 	if(!istype(H))
 		return
 
@@ -278,8 +278,8 @@
 			log_game("Explosive tank rupture! Last key to touch the tank was [src.fingerprintslast].")
 		//Give the gas a chance to build up more pressure through reacting
 		air_contents.react(src)
-		// air_contents.react(src)
-		//Citadel Edit: removing extra react for "balance"
+		air_contents.react(src)
+
 		pressure = air_contents.return_pressure()
 		var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE
 		var/turf/epicenter = get_turf(loc)
diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm
index 0da0e409e3..b9374a09c4 100644
--- a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm
+++ b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm
@@ -178,12 +178,12 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines)		//Machines that require updating (He
 		to_chat(user, "<span class='warning'>Invalid shuttle, restarting bluespace systems...</span>")
 		return FALSE
 
-	var/datum/map_template/shuttle/new_shuttle = new /datum/map_template/shuttle()
+	// var/datum/map_template/shuttle/new_shuttle = new /datum/map_template/shuttle()
 
 	var/obj/docking_port/mobile/port = new /obj/docking_port/mobile(get_turf(target))
 	var/obj/docking_port/stationary/stationary_port = new /obj/docking_port/stationary(get_turf(target))
 	port.callTime = 50
-	port.dir = 1	//Point away from space.
+	port.dir = NORTH	//Point away from space.
 	port.id = "custom_[GLOB.custom_shuttle_count]"
 	linkedShuttleId = port.id
 	port.ignitionTime = 25
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 09478e02fe..456d93c73b 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -81,6 +81,8 @@
 			surgery.status++
 			if(surgery.status > surgery.steps.len)
 				surgery.complete()
+		surgery.step_in_progress = FALSE
+		return advance
 
 	if(target.stat == DEAD && user.client)
 		user.client.give_award(/datum/award/achievement/misc/sandman, user)
@@ -88,7 +90,7 @@
 	surgery.step_in_progress = FALSE
 	if(repeatable)
 		return FALSE //This is how the repeatable surgery detects it shouldn't cycle
-	return advance //Stop the attack chain! - Except on repeatable steps, because otherwise we land in an infinite loop.
+	return TRUE //Stop the attack chain! - Except on repeatable steps, because otherwise we land in an infinite loop.
 
 
 /datum/surgery_step/proc/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery)