Various tweaks, formatting