tweaks to tracking