Changes suggested by Dr. Zirbel

These include some formatting changes as well as some typo fixes.
Merge branch 'develop'