Rearrange/update server responses, correct header typo