fix typo and transitional bugs