Fix numbering in list and other misc. formatting