Improved tracking, including object detection