improve all headers