fix typo and more