Some incremental improvements to camera