made the CLI tool a bit more useful