Some minor wording changes and tag changes.