small changes and adjustments