Additional refinements to command-line tools