More command line options. Should consider moving to getopt.