updating tags to be closer to actual HTML.  Some tags still TBD