further config system work
2 files changed