fix typo and revise comment etc.