More Tweaks and fixes