Merge pull request #2162 from luzpaz/ajustments

Fix several spelling corrections + refinements