tidyed up tags and made them more consistent