#17 minor adjustments