still more tweaks...