Tweaks and edits according to @cewall.

Closes #19.