added tags and made a few
conflicts merged