Additional events and bug fixes
Additional typo fix