Final stylistic tweaks and suchlike