Update to command line examples in Readme + some minor cleanup.