some header changes, I guess