Fixed a few things

Commit this if you want.