Cleaning some things up

Using more descriptive help messages to indicate default values.  Also
using different exit code in one instance so there are no duplicates (so
it's easier to tell by exit code why it failed if it failed)