Also fix some bugs found when refactoring
ditto; and multi-command support was removed in favor of JSON config support