multiple trackers
minor refactorings