Several adjustments to word sets.

Still have to deal with qualifiers (strong, weak) and negations.