Controls now change state
Fixed controls some more