Minor fixes
Merge branch 'master' of github.com:SirWinn3r/World-Whispers