Fix command line flags.
Rename.
Add a converter from strings in the tokens to integers.