Add object tracking; improvements to tracking.