Minor cleanup, fixes
Add custom events for endreset feature