fixes and closes #44