headers and spacing fix