bug fixes in tracker