Updating settings files and handling of settings.
Updating AWS settings.