More calculus rules
Add IDs and whitespaces in lexer