fix typo and update headers