change structure of data messages
change names of events; fix _emit event removal