add tags, fix mistakes