Added a few tweaks to the setting