refactored trackers, fixes #4, fixes #8