Further doc. generation refinements.