Camera Tracking: Updates from review comments