Fix parser groupings
consistent wording
outfile parser
More parent parsers
Prepare for calc
calc WiP