more modular config interface
fix application as well
merge