message-related events + small fixes