More settings tweaks
More settings changes