Few tweaks and more events