Fixed a bunch of things in EventHandler