Added more emoticons, fixed problem with links