Update contrib/README and some comments/messages