working on tokenizer more