more adjustments to the ender events