Fixed a lot of bugs in events
merge