Additional doc improvements