bugfixes, basic dotTracker