finishing up tagging stuff, tagging is now working