event refactors
events fixed