fixes based on pull request