Fixed some bugs concerning the circuit breaking. Still some weird issues I can't seem to find the reason of though :/