Updated template, added junk into taggen.py