fix some more header things