Fixed a lot of issues with eventing & co.