Along with an assortment of other tweaks.
Closes #158 (closed).
This will create a new commit in order to revert the existing changes.
