more awesomeness for the CLI client