rework parsing specs (and parser rules)

Note: parsing function calls still doesn't work