Merge pull request #1621 from jts-arm/typos

Various corrections of typos