Add eventType to event data.

Plus minor fixes.