Updated dict and some smilies