Tweaks and Clean-Up