add/improve a bunch of header directives