Track spacing no longer being scaled with tracks
Collision detection now takes even more cases into account