Minor Tweaks here and there