little refactoring, more camera work