bunch of minor adjustments