add --tag-only and fix some +=