Consolidate and fix the help (-h) output