add more command line params for things, get rid of functions returning tuples in parser templates