fix typo and other minor issues
fix