changed a message name and added more comments