fix typo and more...