Tweaks and small changes!!!