Closes #192. Closes #244.