further work on new config system
2 files changed