Bug fixes. Better command line options.