attemp to beef up and standardize settings.
16 files changed