tweaks and more tweaks