fixed some pull request issues