renamed intermediate data, cleaned up defaults for command line invocation