Fix emote's, also updated TODO a little.