fixed error spans
added missing event fields to jsonbuilder
merged into dev