Various Tweaks & Improvements