Reworked tokenizer again, fixed bugs in last version.