Enhanced collision prevention, including adding to warping.  Fixed some early drop-out of move states.