Added more command-line arguments.

Added ability to take a second command-line argument determining what
calculations to perform.