Cleaned up accidentals and boundaryShapes, zero-ing-in-on rules for collision machine