Config options to turn on/off various features and fixes for cli