yet more minor tweaking