Updated more logic.

More logic for more events, adding as I have time.