Tweaks and testing
additions