Make the headers better.