port a bunch more things to new configuration paradigm