Bug fixes and more events