Flesh out the main header a bit more.
Merge in some header changes.