closes #67, closes #57