fix a few command line labels and make it more consistent