fix spacing
fix typo
Merge pull request #1805 from wakeup/master

Fix some typos