Completing event management and more debug points