Improving doc structure and coverage