more work on tokenizer