Misc Tweaks after testing