re-organized event set definitions and modified some insertEvent conditions for accuracy.
re-organized event set definitions and modified some insertEvent conditions for accuracy.

CastMi/warped2,wilseypa/warped2