Add getEvent, minor changes