Update some tags and some typo bugfix