closes #83, closes #82