Few small Tweaks