* fleshed out the message headers a bit