cleanup, better config management
Wired creation of command runner