Fixes #902 Smilies Improvements

Fixes some minor errors...