Minor changes to the events

Added @EventHandler to the events and some minor fixes