Starting to work in comment boundaries too for token allocation