fix some bugs
fix typo