Fixed bugs

Fix some bugs and commented out emoticons()