Fixed more bugs

Re-added Emoticons