small changes to message sending