A few updates to camera