Changes to TrackBuilder to handle Collison objects, and other cleanup