Merge pull request #2587 from vlakoff/feature/user-guide-cleanup

Fix various typos
Fix a few more merge conflicts