Added more command-line flags for control of the pipeline.