Fix bugs that occur in integration (not working yet still, state problems :()
Fix bug with reapplying events