A few tweaks.

Closes #131.