Emote fixes and additions
Merge pull request #2 from XyyxShard/master

Emote fixes and additions