Updates to Event class

As discussed on message board