Documenting CLI tool
Fixing up CLI issues