tweak headers and rearrange sections