Fix handlers and turn Events into BlockEvents
Fix improper event being listened for
Fix one more listener