A set gypsum-containing composition is disclosed. In one aspect, the set gypsum-containing composition includes an interlocking matrix of the set gypsum formed from at least calcined gypsum, water, and an enhancing material. The enhancing material can be selected from (i) an organic polyphosphonic compound, or a mixture thereof; (ii) a borate selected from ulexite colemanite, or a mixture thereof; or a mixture of (i) and (ii). In another aspect, the set gypsum-containing composition is treated with an enhancing material which can be selected from (i) an organic phosphonic compound or a mixture thereof; (ii) a borate selected from ulexite, colemanite, or a mixture thereof; (iii) a carboxylic compound or a mixture thereof; or a mixture of (i), (ii) and/or (iii).