more sorting out of the headers