Several corrections and enhancements to Geometry computing for the camera