I didn't see there was some extra text here vs what was on the page, but the changes you recommend are good! I auto-generate most of my TOCs, but I should mess with the format more.
