new tracking data, some clean up and updates