Capitalisation and other minor tweaks