fixes and closes #7

fixes and closes #7