Added some fields, stripping some received headers