and more doc improvements