more tweaks...