fixed additional state change issues w/map