Add settings_local
Various Minor Tweaks