Fix #19, #8, #7 - event notifications