General updates to CamCam