Configuration & other misc changes

Configuration is not yet fully ported over to the new system, but will be soon.