fixed those header problems