More fixes and stuff
Merge pull request #561 from WriggleNightbug/patch-2

More fixes and stuff