Some minor Bugfixes.

I'm fixing them as I see them. I'm using this as a bit of a learning tool. Want to make my own mod eventually.