fix #15 typo and more