Add arithmetic expression parsing

Rearranged expr matches for correctness.
Allow function calls as part of arithExprs

Sort of guess and checking a lot here, need to add tests...