diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
index 378aa319032..87b1fe30d7e 100644
--- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
@@ -25,13 +25,15 @@
 			return null
 
 		//Calculate necessary moles to transfer using PV = nRT
-		if((air1.total_moles > 0) && (air1.temperature>0))
+		if(air1.temperature>0)
 			var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2
 
 			var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
 
 			last_pressure_delta = pressure_delta
 
+			//world << "pressure_delta = [pressure_delta]; transfer_moles = [transfer_moles];"
+
 			//Actually transfer the gas
 			var/datum/gas_mixture/removed = air1.remove(transfer_moles)
 
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index e420545917a..b4287def0a7 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -26,7 +26,7 @@
 				if(!M)	return
 				if(p_loc == user.loc && p_loc_m == M.loc)
 					M.handcuffed = new /obj/item/weapon/handcuffs(M)
-					M.update_inv_handcuffed()
+					M.update_clothing()
 
 	else
 		if ((CLUMSY in usr.mutations) && prob(50))
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 723d9afa816..7783ce411d2 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -401,7 +401,7 @@ WELDINGTOOOL
 		"You cut \the [M]'s restraints with \the [src]!",\
 		"You hear cable being cut.")
 		M.handcuffed = null
-		M.update_inv_handcuffed()
+		M.update_clothing()
 		return
 	else
 		..()
\ No newline at end of file
diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index 06a21173169..7adecfeef1e 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -699,8 +699,8 @@
 
 	//breaking out of handcuffs
 	if(usr:handcuffed && usr:canmove && (usr.last_special <= world.time))
-		var/breakouttime = 1200
-		var/displaytime = 2
+		var/breakouttime = 1200 //A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type
+		var/displaytime = 2 //Minutes to display in the "this will take X minutes."
 		if(!usr:canmove)
 			breakouttime = 2400
 			displaytime = 4
@@ -721,8 +721,6 @@
 					usr:handcuffed = null
 		else
 			var/obj/item/weapon/handcuffs/HC = usr:handcuffed
-			var/breakouttime = 1200 //A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type
-			var/displaytime = 2 //Minutes to display in the "this will take X minutes."
 			if(istype(HC)) //If you are handcuffed with actual handcuffs... Well what do I know, maybe someone will want to handcuff you with toilet paper in the future...
 				breakouttime = HC.breakouttime
 				displaytime = breakouttime / 600 //Minutes