More collision detection bugs fixed.