add tags and other changes