some more minor adjustments