yet more tweaks