bug fixes and new tracking code