bug fixed, chatting modified