Camera functionality and minor fixes