Changed some things mostly in the way how events are shown and declared