Added message header, some corrections, etc