further tweaks to the tracking mechanic