Fix some emote ordering
Merge some local changes with internet changes