minor adjustments and upates