update - fix some weird stuff with the event handling