Updated event-d version

House cleaning...