general improvements in the event system
trouble with event system