bug corrections and message header