Adjustments & fixes