more tokeninput fixes