Modify argument parsing to make demos easier
  - Will be replaced by config file parsing later