Reorder command line options with the binary and add the missing ones. Reformat for easier editing.