various changes around settings management