added data fields to the messages, did some general fixes