a few more adjustments