Swap some names around and add some missing smilies.