- added event information
- removed memory leak