some fixes / changes in the tokenizer