minor modifications on message