Switched arguments parsing to ArgumentParser
Minor corrections in setup