Typo's and style
Merge branch 'guides-split'