cleaned up event creation, fixed cleans setting