Pull in latest version of quick-event and fix all the broken stuffs