Shift end-space handling to expr production
Add support for basic math
Improve tokenizer