adding aperture and shutterspeed to settings and small refactoring