Added new fields to track, and improved the tracker