Messaging improvement and comments