Change argument handling to match usage

Change argument handling of output-dir to match usage