a few more tweaks...