Fixes

Few errors solved.
Tracking stuff removed.