address remaining @sawyerbfuller review comments