Minor bug fixes & further event support.