Cleaning up the command line interface + doc update