address more pull request issues