address remaining comments from #363