updated events and stuff