Fixed numbering and formatting issues