fix typos and headers