add message handling; add deletion of events