Fixed a few minor issues
Fixed some issues related to quotes and smileys