Fixed Tokenizer Issue for the most part