User-friendliness fixes based on new doc info.