Move some ENV variables into Settings
More tweaking to settings stuff