more tweaks and testing