Added numbers and operators
A bit better identifier handling