events improvements