Bugfixes, tracking output improvements.