Some headers and other corrections