Emote fixes and additions