message, minor fixes