Start work on parsing tags, minor formatting