More minor tweaks from review findings.