adjustments and cleanup