change order of the command line, args to be more like the users will expect
merged changes