tweak headers and numering