more adjustments and fixes