More fixes

weeeeee
Merge pull request #12 from UberLame/master

More fixes