minor adjustments and additions