Replaced shorthand flag names with longform, comment touch up.