fixed headers and things