closes #89; closes #95