Command line tool improvements