Made some more stuff work!
Merge pull request #1 from TehShrike/master

Made some more stuff work!