Fixed message sending
Some strange changes