Fixed CameraRig and CameraRig integration; Fixed FPS controls; enhanced enitity-test.