and more tweaks...