working some more on tagging stuff