fixes to some headers and stuff