fix indents
fix indents and remove extra newlines
Fix Luke ghost fields
Change some multi-word command line options to use underscores instead of hyphens to be more consistent