Changes to tokenizer, new tokens and parsing.
Some spaces in the others.