fix typo, some cosmetic fixes