fixing some smaller issues for pull request #3