lots of minor adjustments