typo fix and more