Fixed event handling, added all events