Closes #80.
Closes #82.