A few minor changes that Adam forgot to push earlier. Updates to tracker_heartbeat to clean up the strings that are being passed as well as some fixes to the shutdown and restart logic.