a few more tweaks to CameraController