Merge pull request #1825 from luzpaz/tunning

Add several spelling corrections + a refinements