Various content edits

This commit addresses:
* Issue #27
* Issue #40
* Issue #42