adjustments and fixes