header fix (more to come)