improments to the tracking

I believe at this time it's stable and will accept the work