Minor tweaks throughout.