A Few Minor Improvements

These are just a couple of small improvements for you. Mostly just adding some data validation, a few formatting improvements, etc.