Added multi char identifiers and numbers
Added whitespace handling