General Fixes

Just fixed a few things as noted in my commit.

- Maker(Travis Carr)