Retag specs

... this is just changes to the untag script and tag files, I'll merge when it passes