small improvements to change eventing
fixes