Bugfixes and tweaks to tracking and saving data.