messaging changes, fixings