- added choices to ArgumentParser where appropriate.