More work on tokenizer