Small tweeks for CLI & command line app