fix typo bug and others