Update some output, some comments, and some die text in minor ways