added more rules to clean up tokenizer