Fixed and improved events management.