fix typo and follow errors