Update numbering
Update doc blocks