more events and some name fixes