Events can now be set active/inactive + Tweaks