minor tweaks to eventManager