Minor updates to the calculus. Unary function currently included, may
have to remove after all. Parser still work in progress