Few tweaks and updates