Fixing Tracking Issues

Fixing A lot of tracking issues!