fixes and closes #91