Tidy up unused variable and optional code
Dsiaplay a few more items in the config command