Minor updates to command line interface; minor bug fixes.