Development updates for 1.2.1

fixed up broken tag parsing structure