fixed headers and other stuff