Fixed the header and a few others