Tweaks & samples added