Remember tracking and stop before starting a new one. Some fixes.