EventListener speed improvements and bugfixes

EventListener speed improvements and bugfixes