tweaks tweaks and more tweaks...