Tweaks and testing