Typo fixes and corrections.
Merge branch 'saintsaens-master'