Tracking improvements

Half the fix for closing #238. The rest will be implemented in the site.