fixed some headers and stuff