Changed the way the tag worked and did some cleanup on the conversions