merged remaining corrections from Carolyn