Fixed bug in the Tokenizer
Minor changes