fix typo and other stuff