minor updates, submitting two PRs as one