Some reorg, some regex escaping fixes and added matching of Received in a few instances