several minor adjustments