format fix and headers update