Quick Quality-of-Life Improvements

Posting the original to serve as a thread-splitting header before I summarize it.