Added smileys + fixed some bug