Added additional data to events, correlated activity events, fixed bugs