fixed header bugs