More debugging information for #136

Added more events.