further config system work
4 files changed