updated tags, cleared up some issues, pushing to master