minor improvements
Tracker fixes