Merge pull request #1862 from luzpaz/sqash

Add several spelling corrections