API change to --config, also clean up help message