minor adjustments to several classes