some ajustments to the EnderEvents