- Camera improvements, refactor