- Fixed bug where events fired in the wrong order
- Was caused by a mix of arrays being in the wrong order and bad logic.