fixing all the header junk