Cleaning up and adding the last headers.