Tweaks & improvements