tweaks and testing