Update headers and fix typos