fixes and closes #42