add events
bugfix