fixed message name to be more specific, and added a few as well