merged new events and event code fixes from dev
Added initial cut support