event engine changes

still glitchy