Comment updates from @owainga.