Changed docs to use cli and some other changes

Standalone