Several improvements including the clustering of events