Added some ptions on the stream,

And some headers to the output.