some more header fixing, faq is not fixed