Fixed some things with the events