closes #88; closes #90