Updated a few things in the headers