Made a bunch of changes involving reorganizing the header.