Fixing up some stuff, events broken for multiple items!
Fix event system