cleaned up merge conflict, added some more tags to files I had started but not finished