escaping in message, little fixes