fixes and closes #28