Improvements to CLI
Improve and update README.me to be accurate