some movement and toggle fixes