fix typo and more cosmetics