event dispatch optimization, minor upgrades