More handling of events
Once again, I forgot to update the changelog