Improvements to CLI commands and client