minor tweaks and testing