Updated the CLI
Better error handling
Updated docs