updated numbering and more formatting changes