Formatting cleanups
Added undocumented fields to Event type