big commits, removed un-necessary comments, tags, taggings