Small adjustments based off pull request reviews. Waiting on clarifications before adjusting auth-side changes.