added tags and some more additions