fixed event creation stuff