camera controller and other fixes