fixed several headers