fix typo and some other tiny errors