Resolved conflicts.
Cleaned up recording of events.