Collision and state anomaly bugs newly identified in 1.0.21

created