update and fixed some events issues