Much progress on doc