fixed issues noted in pull request