manual tracking: minor bug fixes