lots of bug fixes on the tracking.

- should be rock solid now …