fix bugs and update Message.txt