fix up tags and formatting