A few fixes.

Closes #9 and closes #10.