small messaging changes