Basically final changes to header... I think.