Bunch of stuff, description too short
Fixed some mistakes
Merge pull request #431 from WriggleNightbug/master

Bunch of stuff, description too short