hopefully optimized some things. messed with the camera settings
merge commit