Whoops & More Tweaks and Improvements