added some more event handlers