updates based on Manne's pull request comments