fixes arrow
refactors events helper