more tweaks for pull request