Another round of tracking improvements

1 job for ca/tracking3 in 0 seconds (queued for 57 seconds)