Lots of fussing around with checkpoints. Also added a new vehicle checkpoint for the end point, that vehicles will need to reach.