Fix Up

[billroper]

I added a few more bells and whistles to the project I've been working on today. I still have one more bit of error checking to add and then I'll declare victory and move on to something else.