various minor adjustments