some fixes in delegates and events