Finished up some changes to the header