Continuing Tweaks and changes