Cleanup + Changed event priority on listeners to Monitor
Merged cleanup PR.