Events no longer have eventType set to 'Event' by default, speed fixes, memory leak fixes