added vives and general typo fixes
Merge pull request #183 from jganseman/master

added vives and general typo fixes