Assorted fixes and cleanup related to camera.
Prettify
Various cleanup