Tweaks & minor improvements