yet more minor tweaks