Update contrib guide, minor other edit