. doc improvements and simplifications