A few fixitos and additionitos.

Closes #95.