Multiple bug fixes and additional events