some improvements for event messages