event handling corrections