slight style changes, mostly to events.