A number of changes to implement more versatile tracking.