added some emojis, need some minor change