Prevent a crash and odds and ends

I apologize I didn't get much time today to look at the app, but I tinkered with it some off and on tonight.
Here's some odds and ends: add some, all, or none of it.  :)

Good luck tomorrow!