some additional minor adjustments