Fixed headers to be honest about who wrote what