bug fixing
event engine changes

still glitchy
Merge branch 'JonsBranch'