Misc changes to camera class