Fixed some stuff
Fixed stuff for the new circuitry