Some work towards fixing crash when renaming a tag (and, changes debug mode builtin token count back to 10 because things are really slow otherwise)