More events and fixes