Update messages to include header, fix header to match documentation.