Added cameraSettings

and a bunch of other stuff
Renamed a few things