header fix, etc