Added examples of CLI usage.
Small fixes in cli.py