Made some minor changes to the way settings are loaded
Continuing rearchitecture