Fixed tags and addressed final issues