bug fixes
event management changes