a few more minor adjustments